From 361f90e7320f1169ceea19ab2afcab58b2862308 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 13 May 2022 08:01:57 +0300 Subject: [PATCH 1/2] Update AWS CCM to 13.05.2022 releases --- pkg/model/components/awscloudcontrollermanager.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/model/components/awscloudcontrollermanager.go b/pkg/model/components/awscloudcontrollermanager.go index 069c5a7795..3eb8daf695 100644 --- a/pkg/model/components/awscloudcontrollermanager.go +++ b/pkg/model/components/awscloudcontrollermanager.go @@ -96,9 +96,11 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er case 22: eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.22.0" case 23: - eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0" + eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1" + case 24: + eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0" default: - eccm.Image = "gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.24.0-alpha.0-23-gf6b92bb" + eccm.Image = "gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.24.0-2-g06c1641" } } From 60eb906e6b7729e4d0611bbd2717a1bb9fad262a Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 13 May 2022 08:03:30 +0300 Subject: [PATCH 2/2] Run hack/update-expected.sh --- .../data/aws_s3_object_cluster-completed.spec_content | 2 +- ...m-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content | 2 +- .../aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- .../data/aws_s3_object_cluster-completed.spec_content | 2 +- ...m-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content | 2 +- .../aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- .../data/aws_s3_object_cluster-completed.spec_content | 2 +- ...m-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content | 2 +- .../aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- .../data/aws_s3_object_cluster-completed.spec_content | 2 +- ...m-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content | 2 +- ..._s3_object_minimal-ipv6.example.com-addons-bootstrap_content | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content index 52915d430d..0a6605e784 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content @@ -24,7 +24,7 @@ spec: clusterCIDR: 172.20.0.0/16 clusterName: minimal.example.com configureCloudRoutes: false - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1 leaderElection: leaderElect: true cloudProvider: aws diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index 063b33d08e..ade8a76306 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -48,7 +48,7 @@ spec: value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 412361da50..be67a72e59 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -133,7 +133,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: d9893fa0c53058765199524a48c3410808f1c57ea87c4ecda79414e6916ec871 + manifestHash: 3d10e5986df7b91bb4370438493911d538331bfe7225bc37aed2f38a4c1c9ec9 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index f4dedd0f36..c6e256f641 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -25,7 +25,7 @@ spec: clusterName: minimal.example.com configureCloudRoutes: false enableLeaderMigration: true - image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.24.0-alpha.0-23-gf6b92bb + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0 leaderElection: leaderElect: true cloudProvider: aws diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index 81e6d0ac4a..78fdee011a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -49,7 +49,7 @@ spec: value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.24.0-alpha.0-23-gf6b92bb + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index a9dda97e10..b4b059b9bd 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -133,7 +133,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: c38091031df0df39625bdceb35df3d439bffe80c86ab625e2b2bb60f2ef66473 + manifestHash: 2184fba1fc470722507962a3092d48f53d9f3b5aae11e298248cf08f2b954938 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index 0b3fd309c9..42b4f4c4f6 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: clusterName: minimal.example.com configureCloudRoutes: false enableLeaderMigration: true - image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.24.0-alpha.0-23-gf6b92bb + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0 leaderElection: leaderElect: true cloudProvider: aws diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index 88d2c35431..25a9b8f530 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -45,7 +45,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.24.0-alpha.0-23-gf6b92bb + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 5978439fcb..42d5e8e1d0 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 695a86c879ffa6f7362786ed9e6133c2858e50b63cce425c4d776d1a542c4034 + manifestHash: bab18fd3fa809e9b2ed27b1d362fc3fa7b55818753b2372446e4fe64b4bccb85 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content index 796e251df9..5d13c91ca1 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content @@ -24,7 +24,7 @@ spec: clusterCIDR: ::/0 clusterName: minimal-ipv6.example.com configureCloudRoutes: false - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1 leaderElection: leaderElect: true cloudProvider: aws diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content index 8835dbb20d..dc7006a8fd 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index e25d3cdf25..30abf2611f 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 12d77635de64a84d75ca6524e8c7f12ddb256fa062debf869a2ba9ea56c73e32 + manifestHash: f7e43b1e3154dcdff37bf7d31a81820c875ee3f775b921318a94fb9c179b0984 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io