Merge pull request #14795 from johngmyers/aws-ccm-old

Upgrade older AWS CCM minor versions
2022-12-17 07:15:49 -08:00 · 2022-12-17 07:15:49 -08:00 · ae9fd8c344
parent 0f5fc06cec 9de1ee9459
commit ae9fd8c344
27 changed files with 30 additions and 30 deletions
--- a/pkg/model/components/awscloudcontrollermanager.go
+++ b/pkg/model/components/awscloudcontrollermanager.go
@ -86,13 +86,13 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
 		// See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
 		switch b.KubernetesVersion.Minor {
 		case 21:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.6"
 		case 22:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.22.2"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.22.7"
 		case 23:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.6"
 		case 24:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3"
 		case 25:
 			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.1"
 		case 26:
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
@ -38,7 +38,7 @@ spec:
    clusterName: complex.example.com
    configureCloudRoutes: false
    enableLeaderMigration: true
-    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
    leaderElection:
      leaderElect: true
  cloudLabels:
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.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: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
@ -62,7 +62,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: 9f48cb7f999992fbd0c3237a4a54ab57f017fd9a867145bcc652c20908cbea0d
+    manifestHash: b5584b808d30dfeb942ea4042a1e28135d7fd02cc6ca188e9b0cc0e02492d36e
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/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.21.3
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.6
    leaderElection:
      leaderElect: true
  cloudProvider: aws
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/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-irsa/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.21.3
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.6
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -130,7 +130,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: 9c5708188af7563dc1f6b40d9e9f71ac17e77ae2f1b2a73a39802bc5c5e68c55
+    manifestHash: 4a8b542c2cfebbf97865c7330f48b4911424514227eb871305eb9e9cf6089596
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- 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.2
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.6
    leaderElection:
      leaderElect: true
  cloudProvider: aws
--- 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.2
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.6
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- 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
@ -137,7 +137,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: d14744e1d911757f2ce7cae8a9081f98d4d81a3d692e295370739b1f96c85ea3
+    manifestHash: 2e4b118f43dfeec78ecd2d93f8743bf8de1b2b929780b55a3fdff39dc4fb4826
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- 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: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
    leaderElection:
      leaderElect: true
  cloudProvider: aws
--- 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: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- 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
@ -137,7 +137,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: a8d37b942b473463ad4b933b701ac7bf1d4941b17a677080dddf9919e2e0ebfb
+    manifestHash: 0bf582f560d70129898b28e061c143810d39afc18c802a6f2fbe03b59d482378
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm/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.21.3
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.6
    leaderElection:
      leaderElect: true
  cloudProvider: aws
--- a/tests/integration/update_cluster/many-addons-ccm/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/data/aws_s3_object_minimal.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.21.3
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.6
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -130,7 +130,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: d7f58fb04e8ce9950917391fc43f59022ee18de02cf44427eb958bdf29bc5d8e
+    manifestHash: 4b7c497b4e72fbf2da50089025186016d97231cafecd51d30fad72ca759c5778
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- 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: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
    leaderElection:
      leaderElect: true
  cloudProvider: aws
--- 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: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- 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
@ -55,7 +55,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: 89dcfd1be3ddb538bb6c0c2d02b5e138471ec678e6232beb1c7f2f28447e48d8
+    manifestHash: 185b6fe58d24e28ffdb440cb9a6571d091b8df4117ff393057f0c48337bd4978
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content
@ -24,7 +24,7 @@ spec:
    clusterName: privatecilium.example.com
    configureCloudRoutes: false
    enableLeaderMigration: true
-    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
    leaderElection:
      leaderElect: true
  cloudProvider: aws
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.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: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
@ -70,7 +70,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: 8775463df6c04a561e8aa81df156694ad6667356dcab8168336bbcd77a568fc1
+    manifestHash: b983f3efa7de21a164ba00ebd30f3765ca6deb0c71e840a1755313b37c449249
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content
@ -20,7 +20,7 @@ spec:
    clusterName: minimal.example.com
    configureCloudRoutes: false
    enableLeaderMigration: true
-    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
    leaderElection:
      leaderElect: true
  cloudProvider: aws
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/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: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.3
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -55,7 +55,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: 5fe8db3cf2d2679fb6af939fad699566a6f3e35c2cfa11eba9b5117b0af47712
+    manifestHash: b0ba140e5f0379a87ba7c736d2c1a058d6ee51f00399289c596438627f6d185a
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml
@ -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.21.3
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.6
        imagePullPolicy: IfNotPresent
        name: aws-cloud-controller-manager
        resources:
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
@ -48,7 +48,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.18
    manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: 94e504654220a5b5dfe8db461e8566a471dfd8428cf8fdac4509d51d253285cd
+    manifestHash: 68467913c7df18bea3c8026be6fe92c078fc6b735dea9b62875d13c399630289
    name: aws-cloud-controller.addons.k8s.io
    selector:
      k8s-addon: aws-cloud-controller.addons.k8s.io