Skip to content

Commit 52debb8

Browse files
authored
fix: Stable EBS CSI manifests (#270)
1 parent 35b9fb2 commit 52debb8

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

charts/capi-runtime-extensions/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,6 +1602,7 @@ data:
16021602
containers:
16031603
- args:
16041604
- --endpoint=$(CSI_ENDPOINT)
1605+
- --batching=true
16051606
- --logging-format=text
16061607
- --user-agent-extra=kustomize
16071608
- --v=2
@@ -1630,7 +1631,7 @@ data:
16301631
key: endpoint
16311632
name: aws-meta
16321633
optional: true
1633-
image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.2
1634+
image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.24.1
16341635
imagePullPolicy: IfNotPresent
16351636
livenessProbe:
16361637
failureThreshold: 5
@@ -1666,16 +1667,20 @@ data:
16661667
- mountPath: /var/lib/csi/sockets/pluginproxy/
16671668
name: socket-dir
16681669
- args:
1670+
- --timeout=60s
16691671
- --csi-address=$(ADDRESS)
16701672
- --v=2
16711673
- --feature-gates=Topology=true
16721674
- --extra-create-metadata
16731675
- --leader-election=true
16741676
- --default-fstype=ext4
1677+
- --kube-api-qps=20
1678+
- --kube-api-burst=100
1679+
- --worker-threads=100
16751680
env:
16761681
- name: ADDRESS
16771682
value: /var/lib/csi/sockets/pluginproxy/csi.sock
1678-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.6.0-eks-1-28-7
1683+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.6.2-eks-1-28-9
16791684
imagePullPolicy: IfNotPresent
16801685
name: csi-provisioner
16811686
resources:
@@ -1691,13 +1696,17 @@ data:
16911696
- mountPath: /var/lib/csi/sockets/pluginproxy/
16921697
name: socket-dir
16931698
- args:
1699+
- --timeout=60s
16941700
- --csi-address=$(ADDRESS)
16951701
- --v=2
16961702
- --leader-election=true
1703+
- --kube-api-qps=20
1704+
- --kube-api-burst=100
1705+
- --worker-threads=100
16971706
env:
16981707
- name: ADDRESS
16991708
value: /var/lib/csi/sockets/pluginproxy/csi.sock
1700-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.4.0-eks-1-28-7
1709+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.4.2-eks-1-28-9
17011710
imagePullPolicy: IfNotPresent
17021711
name: csi-attacher
17031712
resources:
@@ -1716,10 +1725,13 @@ data:
17161725
- --csi-address=$(ADDRESS)
17171726
- --leader-election=true
17181727
- --extra-create-metadata
1728+
- --kube-api-qps=20
1729+
- --kube-api-burst=100
1730+
- --worker-threads=100
17191731
env:
17201732
- name: ADDRESS
17211733
value: /var/lib/csi/sockets/pluginproxy/csi.sock
1722-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v6.3.0-eks-1-28-7
1734+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v6.3.2-eks-1-28-9
17231735
imagePullPolicy: IfNotPresent
17241736
name: csi-snapshotter
17251737
resources:
@@ -1735,14 +1747,18 @@ data:
17351747
- mountPath: /var/lib/csi/sockets/pluginproxy/
17361748
name: socket-dir
17371749
- args:
1750+
- --timeout=60s
17381751
- --csi-address=$(ADDRESS)
17391752
- --v=2
17401753
- --handle-volume-inuse-error=false
17411754
- --leader-election=true
1755+
- --kube-api-qps=20
1756+
- --kube-api-burst=100
1757+
- --workers=100
17421758
env:
17431759
- name: ADDRESS
17441760
value: /var/lib/csi/sockets/pluginproxy/csi.sock
1745-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.9.0-eks-1-28-7
1761+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.9.2-eks-1-28-9
17461762
imagePullPolicy: IfNotPresent
17471763
name: csi-resizer
17481764
resources:
@@ -1759,7 +1775,7 @@ data:
17591775
name: socket-dir
17601776
- args:
17611777
- --csi-address=/csi/csi.sock
1762-
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.11.0-eks-1-28-7
1778+
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.11.0-eks-1-28-9
17631779
imagePullPolicy: IfNotPresent
17641780
name: liveness-probe
17651781
resources:
@@ -1912,7 +1928,7 @@ data:
19121928
valueFrom:
19131929
fieldRef:
19141930
fieldPath: spec.nodeName
1915-
image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.23.2
1931+
image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.24.1
19161932
imagePullPolicy: IfNotPresent
19171933
lifecycle:
19181934
preStop:
@@ -1959,7 +1975,7 @@ data:
19591975
value: /csi/csi.sock
19601976
- name: DRIVER_REG_SOCK_PATH
19611977
value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
1962-
image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.9.0-eks-1-28-7
1978+
image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.9.1-eks-1-28-9
19631979
imagePullPolicy: IfNotPresent
19641980
livenessProbe:
19651981
exec:
@@ -1989,7 +2005,7 @@ data:
19892005
name: probe-dir
19902006
- args:
19912007
- --csi-address=/csi/csi.sock
1992-
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.11.0-eks-1-28-7
2008+
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.11.0-eks-1-28-9
19932009
imagePullPolicy: IfNotPresent
19942010
name: liveness-probe
19952011
resources:
@@ -2004,6 +2020,7 @@ data:
20042020
volumeMounts:
20052021
- mountPath: /csi
20062022
name: plugin-dir
2023+
hostNetwork: false
20072024
nodeSelector:
20082025
kubernetes.io/os: linux
20092026
priorityClassName: system-node-critical

make/addons.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
export CALICO_VERSION := v3.26.3
55
export NODE_FEATURE_DISCOVERY_VERSION := 0.14.1
66
export AWS_CSI_SNAPSHOT_CONTROLLER_VERSION := v6.3.0
7-
export AWS_EBS_CSI_VERSION := release-1.23
7+
export AWS_EBS_CSI_VERSION := v1.25.0
88
export AWS_CPI_VERSION_127 := v1.27.1
99

1010
.PHONY: addons.sync

0 commit comments

Comments
 (0)