From cd269a63a4b2b566caad46571b2de5cede04ba2b Mon Sep 17 00:00:00 2001 From: elijah quinones Date: Tue, 21 Jan 2025 21:18:12 +0000 Subject: [PATCH] CI TEST DO NOT MERGE --- .../templates/clusterrole-snapshotter.yaml | 5 +---- charts/aws-ebs-csi-driver/values.yaml | 15 +++++++-------- .../kubernetes/base/clusterrole-snapshotter.yaml | 5 +---- deploy/kubernetes/base/controller.yaml | 10 +++++----- deploy/kubernetes/base/node.yaml | 4 ++-- .../overlays/stable/gcr/kustomization.yaml | 8 ++++---- 6 files changed, 20 insertions(+), 27 deletions(-) diff --git a/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml b/charts/aws-ebs-csi-driver/templates/clusterrole-snapshotter.yaml index a0188341ca..8a3fadfa0a 100644 --- 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 index 1b64238713..4be12619b5 100644 --- 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" + tag: "v5.1.0-eks-1-32-4" logLevel: 2 # Additional parameters provided by external-provisioner. additionalArgs: [] @@ -50,7 +49,7 @@ sidecars: image: pullPolicy: IfNotPresent repository: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher - tag: "v4.7.0-eks-1-32-1" + tag: "v4.8.0-eks-1-31-12" # Tune leader lease election for csi-attacher. # Leader election is on by default. leaderElection: @@ -79,7 +78,7 @@ sidecars: image: pullPolicy: IfNotPresent repository: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter - tag: "v8.1.0-eks-1-32-1" + tag: "v8.2.0-eks-1-32-4" logLevel: 2 # Additional parameters provided by csi-snapshotter. additionalArgs: [] @@ -95,7 +94,7 @@ sidecars: image: pullPolicy: IfNotPresent repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe - tag: "v2.14.0-eks-1-32-1" + tag: "v2.14.0-eks-1-32-4" # Additional parameters provided by livenessprobe. additionalArgs: [] resources: {} @@ -107,7 +106,7 @@ sidecars: image: pullPolicy: IfNotPresent repository: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer - tag: "v1.12.0-eks-1-32-1" + tag: "v1.13.1-eks-1-31-12" # Tune leader lease election for csi-resizer. # Leader election is on by default. leaderElection: @@ -134,7 +133,7 @@ sidecars: image: pullPolicy: IfNotPresent repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar - tag: "v2.12.0-eks-1-32-1" + tag: "v2.13.0-eks-1-31-12" logLevel: 2 # Additional parameters provided by node-driver-registrar. additionalArgs: [] @@ -156,7 +155,7 @@ sidecars: image: pullPolicy: IfNotPresent repository: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s - tag: "v0.5.0" + tag: "v0.5.1" leaderElection: enabled: true # Optional values to tune lease behavior. diff --git a/deploy/kubernetes/base/clusterrole-snapshotter.yaml b/deploy/kubernetes/base/clusterrole-snapshotter.yaml index 7760afc0a5..9af6cef56d 100644 --- 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 index 15df7c61f6..5e600d81a5 100644 --- 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: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.1.0-eks-1-32-4 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: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.8.0-eks-1-31-12 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: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v8.2.0-eks-1-32-4 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: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.13.1-eks-1-31-12 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: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-4 imagePullPolicy: IfNotPresent args: - --csi-address=/csi/csi.sock diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml index 6fbab085e1..a424553826 100644 --- 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: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.13.0-eks-1-31-12 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: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-4 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 index ebbe6b2a4c..4d717e6d7e 100644 --- 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 - 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