From 0a3a4e9c7ffc0d95589a2d7c87b458e9d8a21397 Mon Sep 17 00:00:00 2001 From: Fabian Kammel Date: Fri, 26 Aug 2022 09:44:05 +0000 Subject: [PATCH] move util Signed-off-by: Fabian Kammel --- bootstrapper/internal/kubernetes/kubernetes.go | 16 ++++++++++++++-- bootstrapper/util/util.go | 17 ----------------- go.mod | 2 +- hack/go.mod | 14 +++++++------- 4 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 bootstrapper/util/util.go diff --git a/bootstrapper/internal/kubernetes/kubernetes.go b/bootstrapper/internal/kubernetes/kubernetes.go index 319a99887..b9f5111ef 100644 --- a/bootstrapper/internal/kubernetes/kubernetes.go +++ b/bootstrapper/internal/kubernetes/kubernetes.go @@ -9,7 +9,6 @@ import ( "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi" "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/bootstrapper/util" "github.com/edgelesssys/constellation/internal/cloud/metadata" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/iproute" @@ -64,7 +63,7 @@ func New(cloudProvider string, clusterUtil clusterUtil, configProvider configura clusterAutoscaler: clusterAutoscaler, providerMetadata: providerMetadata, initialMeasurementsJSON: initialMeasurementsJSON, - getIPAddr: util.GetIPAddr, + getIPAddr: getIPAddr, } } @@ -448,3 +447,16 @@ func k8sCompliantHostname(in string) string { func (k *KubeWrapper) StartKubelet() error { return k.clusterUtil.StartKubelet() } + +// getIPAddr retrieves to default sender IP used for outgoing connection. +func getIPAddr() (string, error) { + conn, err := net.Dial("udp", "8.8.8.8:80") + if err != nil { + return "", err + } + defer conn.Close() + + localAddr := conn.LocalAddr().(*net.UDPAddr) + + return localAddr.IP.String(), nil +} diff --git a/bootstrapper/util/util.go b/bootstrapper/util/util.go deleted file mode 100644 index ea6e3e25d..000000000 --- a/bootstrapper/util/util.go +++ /dev/null @@ -1,17 +0,0 @@ -package util - -import ( - "net" -) - -func GetIPAddr() (string, error) { - conn, err := net.Dial("udp", "8.8.8.8:80") - if err != nil { - return "", err - } - defer conn.Close() - - localAddr := conn.LocalAddr().(*net.UDPAddr) - - return localAddr.IP.String(), nil -} diff --git a/go.mod b/go.mod index 4fdfc579d..8755f901f 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,6 @@ require ( go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e - golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 google.golang.org/api v0.85.0 google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad google.golang.org/grpc v1.48.0 @@ -171,6 +170,7 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect + golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect k8s.io/klog/v2 v2.60.1 // indirect k8s.io/kubectl v0.24.2 // indirect oras.land/oras-go v1.2.0 // indirect diff --git a/hack/go.mod b/hack/go.mod index af3e56a09..e3e8adf9e 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -33,22 +33,28 @@ replace ( replace github.com/edgelesssys/constellation => ./.. require ( + cloud.google.com/go/compute v1.7.0 + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1 + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 github.com/edgelesssys/constellation v1.0.0 github.com/go-git/go-git/v5 v5.4.2 github.com/google/go-tpm-tools v0.3.8 + github.com/google/uuid v1.3.0 github.com/spf13/afero v1.9.2 github.com/spf13/cobra v1.5.0 github.com/stretchr/testify v1.7.5 go.uber.org/goleak v1.1.12 go.uber.org/zap v1.21.0 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 + google.golang.org/api v0.86.0 + google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f google.golang.org/grpc v1.48.0 gopkg.in/yaml.v3 v3.0.1 libvirt.org/go/libvirt v1.8004.0 ) require ( - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2 v2.0.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2 v2.0.0 github.com/Microsoft/go-winio v0.5.2 // indirect github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect github.com/acomagu/bufpipe v1.0.3 // indirect @@ -67,14 +73,11 @@ require ( require ( cloud.google.com/go v0.102.0 // indirect - cloud.google.com/go/compute v1.7.0 // indirect cloud.google.com/go/iam v0.3.0 // indirect cloud.google.com/go/kms v1.4.0 // indirect cloud.google.com/go/resourcemanager v1.2.0 // indirect cloud.google.com/go/storage v1.22.1 // indirect github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.6.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.8.0 // indirect @@ -132,7 +135,6 @@ require ( github.com/google/go-tpm v0.3.3 // indirect github.com/google/go-tspi v0.3.0 // indirect github.com/google/tink/go v1.6.1 // indirect - github.com/google/uuid v1.3.0 // indirect github.com/googleapis/gax-go/v2 v2.4.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect @@ -162,9 +164,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect - google.golang.org/api v0.86.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect