From 01d94fa392bc25a0f2cc79451a8c61a7f2eb812d Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Mon, 18 Apr 2022 08:17:58 +0200 Subject: [PATCH] Bump CCM 1.22 and 1.23 images to stable versions --- pkg/model/components/awscloudcontrollermanager.go | 4 ++-- .../data/aws_s3_object_cluster-completed.spec_content | 2 +- ...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 +- ...addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content | 2 +- ...3_object_minimal-ipv6.example.com-addons-bootstrap_content | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/model/components/awscloudcontrollermanager.go b/pkg/model/components/awscloudcontrollermanager.go index bce182ae7d..faf35778e5 100644 --- a/pkg/model/components/awscloudcontrollermanager.go +++ b/pkg/model/components/awscloudcontrollermanager.go @@ -94,9 +94,9 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er case 21: eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0" case 22: - eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.22.0-alpha.2" + 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.0" case 24: eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0" default: 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 7272decb48..5a04a586c6 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.0 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 7c535bf599..ea374a97d6 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 @@ -38,7 +38,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.0 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 056787f48d..e7a6cf5d1b 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: 083f6ef8cebae413b44d6a70d3e06e8e5189e12c52be82db33f6a2848b45aad8 + manifestHash: f59ed4baa6061c0251e0db04a8dbad9ac866d0faa9e510d37c7b966e9043bfd7 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 329e000b51..5a3c884907 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.0 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 252ba900c3..efc27b2558 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 @@ -34,7 +34,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.0 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 9557858996..ad74680917 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: ce6df3da38c2580a9960a3ac3277c1d8db405aa89b95b9b14b63b4a71dc0fc53 + manifestHash: e15435df00134be9b35478dc4de8c767361700174a38b44002db6087a0ca0f11 name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io