fix: use correct AWS EBS CSI images (#344)

nutanix-cloud-native · Feb 12, 2024 · 1ede865 · 1ede865
1 parent 02b15e8
commit 1ede865
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/charts/capi-runtime-extensions/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml b/charts/capi-runtime-extensions/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml
@@ -1631,7 +1631,7 @@ data:
                   key: endpoint
                   name: aws-meta
                   optional: true
-            image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.24.1
+            image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.25.0
             imagePullPolicy: IfNotPresent
             livenessProbe:
               failureThreshold: 5
@@ -1847,7 +1847,7 @@ data:
           - args:
             - --v=5
             - --leader-election=true
-            image: registry.k8s.io/sig-storage/snapshot-controller:v6.2.1
+            image: registry.k8s.io/sig-storage/snapshot-controller:v6.3.0
             imagePullPolicy: IfNotPresent
             name: snapshot-controller
           nodeSelector: {}
@@ -1928,7 +1928,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-            image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.24.1
+            image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.25.0
             imagePullPolicy: IfNotPresent
             lifecycle:
               preStop:

diff --git a/hack/addons/kustomize/aws-ebs-csi/kustomization.yaml.tmpl b/hack/addons/kustomize/aws-ebs-csi/kustomization.yaml.tmpl
@@ -37,3 +37,10 @@ patches:
     kind: DaemonSet
     name: ebs-csi-node
     namespace: kube-system
+
+# always override the images to match the version from the set envs
+images:
+- name: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver
+  newTag: ${AWS_EBS_CSI_VERSION}
+- name: registry.k8s.io/sig-storage/snapshot-controller
+  newTag: ${AWS_CSI_SNAPSHOT_CONTROLLER_VERSION}