[DO NOT MERGE] Test new upstream sidecars

Signed-off-by: Connor Catlett <[email protected]>
kubernetes-sigs · Jan 14, 2025 · 9ea58d4 · 9ea58d4
1 parent b28e70d
commit 9ea58d4
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 41 deletions.
diff --git a/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml b/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml
@@ -22,12 +22,9 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotclasses"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshots"]
-    verbs: ["get", "list", "watch", "update", "patch", "create"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["get", "list", "watch", "update", "patch", "create"]
+    verbs: ["get", "list", "watch", "update", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
     verbs: ["update", "patch"]

diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
@@ -16,14 +16,13 @@ customLabels: {}
 # The EBS CSI Driver FIPS images have not undergone FIPS certification, and no official guarnatee is made about the compliance of these images under the FIPS standard
 # Users relying on these images for FIPS compliance should perform their own independent evaluation
 fips: false
-
 sidecars:
   provisioner:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-      tag: "v5.1.0-eks-1-32-1"
+      repository: registry.k8s.io/sig-storage/csi-provisioner
+      tag: "v5.1.0"
     logLevel: 2
     # Additional parameters provided by external-provisioner.
     additionalArgs: []
@@ -49,8 +48,8 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
-      tag: "v4.7.0-eks-1-32-1"
+      repository: registry.k8s.io/sig-storage/csi-attacher
+      tag: "v4.8.0"
     # Tune leader lease election for csi-attacher.
     # Leader election is on by default.
     leaderElection:
@@ -78,8 +77,8 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
-      tag: "v8.1.0-eks-1-32-1"
+      repository: registry.k8s.io/sig-storage/csi-snapshotter
+      tag: "v8.2.0"
     logLevel: 2
     # Additional parameters provided by csi-snapshotter.
     additionalArgs: []
@@ -94,8 +93,8 @@ sidecars:
   livenessProbe:
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-      tag: "v2.14.0-eks-1-32-1"
+      repository: registry.k8s.io/sig-storage/livenessprobe
+      tag: "v2.15.0"
     # Additional parameters provided by livenessprobe.
     additionalArgs: []
     resources: {}
@@ -106,8 +105,8 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
-      tag: "v1.12.0-eks-1-32-1"
+      repository: registry.k8s.io/sig-storage/csi-resizer
+      tag: "v1.13.1"
     # Tune leader lease election for csi-resizer.
     # Leader election is on by default.
     leaderElection:
@@ -133,8 +132,8 @@ sidecars:
     env: []
     image:
       pullPolicy: IfNotPresent
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-      tag: "v2.12.0-eks-1-32-1"
+      repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+      tag: "v2.13.0"
     logLevel: 2
     # Additional parameters provided by node-driver-registrar.
     additionalArgs: []
@@ -512,4 +511,4 @@ nodeComponentOnly: false
 helmTester:
   enabled: true
   # Supply a custom image to the ebs-csi-driver-test pod in helm-tester.yaml
-  image: "us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20241128-8df65c072f-master"
+  image: "us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20241230-3006692a6f-master"
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -14,7 +14,7 @@
 
 timeout: 5400s
 steps:
-  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241111-71c32dbdcc
+  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241229-5dc092c636
     entrypoint: ./hack/cloudbuild.sh
     env:
       - GIT_TAG=${_GIT_TAG}

diff --git a/deploy/kubernetes/base/clusterrole-snapshotter.yaml b/deploy/kubernetes/base/clusterrole-snapshotter.yaml
@@ -22,12 +22,9 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotclasses"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshots"]
-    verbs: ["get", "list", "watch", "update", "patch", "create"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["get", "list", "watch", "update", "patch", "create"]
+    verbs: ["get", "list", "watch", "update", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
     verbs: ["update", "patch"]

diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
@@ -133,7 +133,7 @@ spec:
             seccompProfile:
               type: RuntimeDefault
         - name: csi-provisioner
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.1.0-eks-1-32-1
+          image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
           imagePullPolicy: IfNotPresent
           args:
             - --timeout=60s
@@ -166,7 +166,7 @@ spec:
             seccompProfile:
               type: RuntimeDefault
         - name: csi-attacher
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.7.0-eks-1-32-1
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
           imagePullPolicy: IfNotPresent
           args:
             - --timeout=60s
@@ -195,7 +195,7 @@ spec:
             seccompProfile:
               type: RuntimeDefault
         - name: csi-snapshotter
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v8.1.0-eks-1-32-1
+          image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -224,7 +224,7 @@ spec:
             seccompProfile:
               type: RuntimeDefault
         - name: csi-resizer
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.12.0-eks-1-32-1
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
           imagePullPolicy: IfNotPresent
           args:
             - --timeout=60s
@@ -255,7 +255,7 @@ spec:
             seccompProfile:
               type: RuntimeDefault
         - name: liveness-probe
-          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-1
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml
@@ -105,7 +105,7 @@ spec:
               exec:
                 command: ["/bin/aws-ebs-csi-driver", "pre-stop-hook"]
         - name: node-driver-registrar
-          image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.12.0-eks-1-32-1
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -142,7 +142,7 @@ spec:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
         - name: liveness-probe
-          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-1
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

diff --git a/deploy/kubernetes/overlays/stable/gcr/kustomization.yaml b/deploy/kubernetes/overlays/stable/gcr/kustomization.yaml
@@ -10,16 +10,16 @@ images:
     newTag: v5.1.0
   - name: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
     newName: registry.k8s.io/sig-storage/csi-attacher
-    newTag: v4.7.0
+    newTag: v4.8.0
   - name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
     newName: registry.k8s.io/sig-storage/livenessprobe
-    newTag: v2.14.0
+    newTag: v2.15.0
   - name: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
     newName: registry.k8s.io/sig-storage/csi-snapshotter
-    newTag: v8.1.0
+    newTag: v8.2.0
   - name: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
     newName: registry.k8s.io/sig-storage/csi-resizer
-    newTag: v1.12.0
+    newTag: v1.13.1
   - name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
     newName: registry.k8s.io/sig-storage/csi-node-driver-registrar
-    newTag: v2.12.0
+    newTag: v2.13.0
diff --git a/hack/release-scripts/image-digests-template.yaml b/hack/release-scripts/image-digests-template.yaml
@@ -14,28 +14,28 @@
 
 sidecars:
   snapshotter:
-    image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
+    image: registry.k8s.io/sig-storage/csi-snapshotter
     repo: https://github.com/kubernetes-csi/external-snapshotter
     rbacSource: deploy/kubernetes/csi-snapshotter/rbac-csi-snapshotter.yaml
     rbacDestination: clusterrole-snapshotter.yaml
   attacher:
-    image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
+    image: registry.k8s.io/sig-storage/csi-attacher
     repo: https://github.com/kubernetes-csi/external-attacher
     rbacSource: deploy/kubernetes/rbac.yaml
     rbacDestination: clusterrole-attacher.yaml
   provisioner:
-    image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
+    image: registry.k8s.io/sig-storage/csi-provisioner
     repo: https://github.com/kubernetes-csi/external-provisioner
     rbacSource: deploy/kubernetes/rbac.yaml
     rbacDestination: clusterrole-provisioner.yaml
   resizer:
-    image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
+    image: registry.k8s.io/sig-storage/csi-resizer
     repo: https://github.com/kubernetes-csi/external-resizer
     rbacSource: deploy/kubernetes/rbac.yaml
     rbacDestination: clusterrole-resizer.yaml
   livenessProbe:
-    image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
+    image: registry.k8s.io/sig-storage/livenessprobe
   nodeDriverRegistrar:
-    image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
+    image: registry.k8s.io/sig-storage/csi-node-driver-registrar
   volumemodifier:
     image: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s