Merge pull request kubernetes#16513 from hakman/aws_upgrades

aws: Update components before release
jValdron · May 4, 2024 · f16dfac · f16dfac
2 parents ba67b94 + 278acff
commit f16dfac
Show file tree

Hide file tree

Showing 305 changed files with 1,951 additions and 1,955 deletions.
diff --git a/pkg/model/components/awscloudcontrollermanager.go b/pkg/model/components/awscloudcontrollermanager.go
@@ -76,17 +76,21 @@ 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 24:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.15"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.19"
 		case 25:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.3"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.15"
 		case 26:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11"
 		case 27:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.2"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.6"
 		case 28:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.1"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.5"
+		case 29:
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.2"
+		case 30:
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.0"
 		default:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.1"
+			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.0"
 		}
 	}
 

diff --git a/pkg/model/components/awsebscsidriver.go b/pkg/model/components/awsebscsidriver.go
@@ -43,7 +43,7 @@ func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error {
 	c := aws.EBSCSIDriver
 
 	if c.Version == nil {
-		version := "v1.28.0"
+		version := "v1.30.0"
 		c.Version = &version
 	}
 

diff --git a/..._additionalobjects.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/..._additionalobjects.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.28.1
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.5
         imagePullPolicy: IfNotPresent
         name: aws-cloud-controller-manager
         resources:

diff --git a/...ct_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/...ct_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-controller
   namespace: kube-system
@@ -33,7 +33,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-controller-sa
   namespace: kube-system
@@ -51,7 +51,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-node-sa
   namespace: kube-system
@@ -68,7 +68,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-external-attacher-role
 rules:
@@ -127,7 +127,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-node-role
 rules:
@@ -159,7 +159,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-external-provisioner-role
 rules:
@@ -251,7 +251,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-external-resizer-role
 rules:
@@ -319,7 +319,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-external-snapshotter-role
 rules:
@@ -372,7 +372,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-attacher-binding
 roleRef:
@@ -396,7 +396,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-node-getter-binding
 roleRef:
@@ -420,7 +420,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-provisioner-binding
 roleRef:
@@ -444,7 +444,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-resizer-binding
 roleRef:
@@ -468,7 +468,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-snapshotter-binding
 roleRef:
@@ -492,7 +492,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-leases-role
   namespace: kube-system
@@ -521,7 +521,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-leases-rolebinding
   namespace: kube-system
@@ -568,7 +568,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-node
   namespace: kube-system
@@ -587,7 +587,7 @@ spec:
         app.kubernetes.io/component: csi-driver
         app.kubernetes.io/instance: aws-ebs-csi-driver
         app.kubernetes.io/name: aws-ebs-csi-driver
-        app.kubernetes.io/version: v1.28.0
+        app.kubernetes.io/version: v1.30.0
         kops.k8s.io/managed-by: kops
     spec:
       affinity:
@@ -624,7 +624,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.28.0
+        image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.30.0
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -764,7 +764,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs-csi-controller
   namespace: kube-system
@@ -788,7 +788,7 @@ spec:
         app.kubernetes.io/component: csi-driver
         app.kubernetes.io/instance: aws-ebs-csi-driver
         app.kubernetes.io/name: aws-ebs-csi-driver
-        app.kubernetes.io/version: v1.28.0
+        app.kubernetes.io/version: v1.30.0
         kops.k8s.io/managed-by: kops
     spec:
       affinity:
@@ -866,7 +866,7 @@ spec:
               key: endpoint
               name: aws-meta
               optional: true
-        image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.28.0
+        image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.30.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 5
@@ -1079,7 +1079,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-ebs-csi-driver
-    app.kubernetes.io/version: v1.28.0
+    app.kubernetes.io/version: v1.30.0
     k8s-addon: aws-ebs-csi-driver.addons.k8s.io
   name: ebs.csi.aws.com
 spec:

diff --git a/...ditionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/...ditionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
@@ -99,14 +99,14 @@ spec:
     version: 9.99.0
   - id: k8s-1.18
     manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: c5ffc233a49f9de4e50637188f27a31884b251e1efeb6596b8ac519bbd9c625d
+    manifestHash: 6168b5543171c2043ca73fcb525dd35339c862275b6edc30d541941071aa07fa
     name: aws-cloud-controller.addons.k8s.io
     selector:
       k8s-addon: aws-cloud-controller.addons.k8s.io
     version: 9.99.0
   - id: k8s-1.17
     manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 6c923ad1a9a1f57aefd9dd4d8405e4a9c61cbb2b59aa65e5fd96e7cac758c2d2
+    manifestHash: e112ee6e370a2b1b78b4d11781ea0a181d4a8c33e0a44bbbf07c4ed5dc873603
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
@@ -11,14 +11,14 @@ spec:
   channel: stable
   cloudConfig:
     awsEBSCSIDriver:
-      version: v1.28.0
+      version: v1.30.0
     manageStorageClasses: true
   cloudControllerManager:
     allocateNodeCIDRs: true
     clusterCIDR: 100.96.0.0/11
     clusterName: additionalobjects.example.com
     configureCloudRoutes: false
-    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.1
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.5
     leaderElection:
       leaderElect: true
   cloudProvider: aws

diff --git a/...tegration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/...tegration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
@@ -11,14 +11,14 @@ spec:
   channel: stable
   cloudConfig:
     awsEBSCSIDriver:
-      version: v1.28.0
+      version: v1.30.0
     manageStorageClasses: true
   cloudControllerManager:
     allocateNodeCIDRs: true
     clusterCIDR: 100.96.0.0/11
     clusterName: minimal.example.com
     configureCloudRoutes: false
-    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.2
+    image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.6
     leaderElection:
       leaderElect: true
   cloudProvider: aws

diff --git a/..._s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content b/..._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.27.2
+        image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.6
         imagePullPolicy: IfNotPresent
         name: aws-cloud-controller-manager
         resources: