From 6921d7c7a509e6e4fda6f68b1fa2437da80f37a5 Mon Sep 17 00:00:00 2001 From: Konstantinos Angelopoulos Date: Tue, 11 Oct 2022 17:56:58 +0300 Subject: [PATCH] fix test-defs --- .test-defs/bastion-test.yaml | 2 +- .test-defs/dnsrecord-test.yaml | 2 +- .test-defs/infrastructure-test.yaml | 2 +- .test-defs/provider-aws.yaml | 2 +- Dockerfile | 2 +- pkg/controller/infrastructure/configvalidator.go | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.test-defs/bastion-test.yaml b/.test-defs/bastion-test.yaml index 5d22197c7..6b93b5d89 100644 --- a/.test-defs/bastion-test.yaml +++ b/.test-defs/bastion-test.yaml @@ -16,4 +16,4 @@ spec: --secret-access-key=$SECRET_ACCESS_KEY --region=$REGION - image: golang:1.17.5 + image: golang:1.19.2 diff --git a/.test-defs/dnsrecord-test.yaml b/.test-defs/dnsrecord-test.yaml index 8ecb82c4c..58fe28f6f 100644 --- a/.test-defs/dnsrecord-test.yaml +++ b/.test-defs/dnsrecord-test.yaml @@ -15,4 +15,4 @@ spec: --access-key-id=$DNS_ACCESS_KEY_ID --secret-access-key=$DNS_SECRET_ACCESS_KEY - image: golang:1.17.5 + image: golang:1.19.2 diff --git a/.test-defs/infrastructure-test.yaml b/.test-defs/infrastructure-test.yaml index f32d3d1ba..56135d2c0 100644 --- a/.test-defs/infrastructure-test.yaml +++ b/.test-defs/infrastructure-test.yaml @@ -16,4 +16,4 @@ spec: --secret-access-key=$SECRET_ACCESS_KEY --region=$REGION - image: golang:1.17.5 + image: golang:1.19.2 diff --git a/.test-defs/provider-aws.yaml b/.test-defs/provider-aws.yaml index a2f1813ec..04bdf5fb2 100644 --- a/.test-defs/provider-aws.yaml +++ b/.test-defs/provider-aws.yaml @@ -18,4 +18,4 @@ spec: --network-worker-cidr=$NETWORK_WORKER_CIDR --zone=$ZONE - image: golang:1.17.5 + image: golang:1.19.2 diff --git a/Dockerfile b/Dockerfile index a257005cf..c31a456ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ############# builder -FROM golang:1.19.1 AS builder +FROM golang:1.19.2 AS builder WORKDIR /go/src/github.com/gardener/gardener-extension-provider-aws COPY . . diff --git a/pkg/controller/infrastructure/configvalidator.go b/pkg/controller/infrastructure/configvalidator.go index baeb9fe23..2cc80945f 100644 --- a/pkg/controller/infrastructure/configvalidator.go +++ b/pkg/controller/infrastructure/configvalidator.go @@ -18,17 +18,17 @@ import ( "context" "fmt" - "github.com/gardener/gardener-extension-provider-aws/pkg/apis/aws/helper" - "github.com/gardener/gardener-extension-provider-aws/pkg/aws" - awsclient "github.com/gardener/gardener-extension-provider-aws/pkg/aws/client" - "k8s.io/apimachinery/pkg/util/sets" - "github.com/gardener/gardener/extensions/pkg/controller/common" "github.com/gardener/gardener/extensions/pkg/controller/infrastructure" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "github.com/go-logr/logr" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/gardener/gardener-extension-provider-aws/pkg/apis/aws/helper" + "github.com/gardener/gardener-extension-provider-aws/pkg/aws" + awsclient "github.com/gardener/gardener-extension-provider-aws/pkg/aws/client" ) // configValidator implements ConfigValidator for aws infrastructure resources. @@ -130,8 +130,8 @@ func (c *configValidator) validateVPC(ctx context.Context, awsClient awsclient.I // validateEIP validates if the given elastic IP exists and can be associated by the Shoot's NAT gateway // An EIP can be associated with the Shoot when -// - it is not associated yet (new) -// - it is already associated to any Gardener-created NAT Gateway of the Shoot cluster (identified by tag `kubernetes.io/cluster/`) +// - it is not associated yet (new) +// - it is already associated to any Gardener-created NAT Gateway of the Shoot cluster (identified by tag `kubernetes.io/cluster/`) func (c *configValidator) validateEIPS(ctx context.Context, awsClient awsclient.Interface, shootNamespace string, elasticIPAllocationIDs []string, elasticIPAllocationIDToZone map[string]string, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{}