Skip to content

Commit 2ab89fd

Browse files
authored
Merge pull request #857 from vdhanan/pdb
add pod disruption budget for csi controller
2 parents 95ab71a + 6a0933e commit 2ab89fd

File tree

8 files changed

+31
-4
lines changed

8 files changed

+31
-4
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,4 @@ generate-kustomize: bin/helm
159159
cd charts/aws-ebs-csi-driver && ../../bin/helm template kustomize . -s templates/serviceaccount-snapshot-controller.yaml -f ../../deploy/kubernetes/values/snapshotter.yaml > ../../deploy/kubernetes/overlays/alpha/serviceaccount-snapshot-controller.yaml
160160
cd charts/aws-ebs-csi-driver && ../../bin/helm template kustomize . -s templates/snapshot-controller.yaml -f ../../deploy/kubernetes/values/snapshotter.yaml > ../../deploy/kubernetes/overlays/alpha/snapshot_controller.yaml
161161
cd charts/aws-ebs-csi-driver && ../../bin/helm template kustomize . -s templates/serviceaccount-csi-node.yaml > ../../deploy/kubernetes/base/serviceaccount-csi-node.yaml
162+
cd charts/aws-ebs-csi-driver && ../../bin/helm template kustomize . -s templates/controller-poddisruptionbudget.yaml > ../../deploy/kubernetes/base/controller-poddisruptionbudget.yaml

charts/aws-ebs-csi-driver/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: "0.10.1"
33
name: aws-ebs-csi-driver
44
description: A Helm chart for AWS EBS CSI Driver
5-
version: 0.10.2
5+
version: 0.10.3
66
kubeVersion: ">=1.17.0-0"
77
home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
88
sources:
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
kind: PodDisruptionBudget
3+
apiVersion: policy/v1beta1
4+
metadata:
5+
name: ebs-csi-controller-pod-disruption-budget
6+
namespace: kube-system
7+
spec:
8+
minAvailable: 1
9+
selector:
10+
matchLabels:
11+
app: ebs-csi-controller

charts/aws-ebs-csi-driver/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ resources:
6161
# choice for the user. This also increases chances charts run on environments with little
6262
# resources, such as Minikube. If you do want to specify resources, uncomment the following
6363
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
64+
# Note that you will need to set resource requests if you want the cluster autoscaler to
65+
# scale your nodes when you increase/decrease the number of ebs-csi-controller replicas.
6466
# limits:
6567
# cpu: 100m
6668
# memory: 128Mi
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
# Source: aws-ebs-csi-driver/templates/controller-poddisruptionbudget.yaml
3+
kind: PodDisruptionBudget
4+
apiVersion: policy/v1beta1
5+
metadata:
6+
name: ebs-csi-controller-pod-disruption-budget
7+
namespace: kube-system
8+
spec:
9+
minAvailable: 1
10+
selector:
11+
matchLabels:
12+
app: ebs-csi-controller

deploy/kubernetes/base/controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ spec:
7777
periodSeconds: 10
7878
failureThreshold: 5
7979
- name: csi-provisioner
80-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
80+
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
8181
args:
8282
- --csi-address=$(ADDRESS)
8383
- --v=5
@@ -91,7 +91,7 @@ spec:
9191
- name: socket-dir
9292
mountPath: /var/lib/csi/sockets/pluginproxy/
9393
- name: csi-attacher
94-
image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.0
94+
image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
9595
args:
9696
- --csi-address=$(ADDRESS)
9797
- --v=5

deploy/kubernetes/base/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ resources:
77
- clusterrolebinding-attacher.yaml
88
- clusterrolebinding-provisioner.yaml
99
- controller.yaml
10+
- controller-poddisruptionbudget.yaml
1011
- csidriver.yaml
1112
- node.yaml
1213
- serviceaccount-csi-controller.yaml

deploy/kubernetes/base/node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ spec:
7272
periodSeconds: 10
7373
failureThreshold: 5
7474
- name: node-driver-registrar
75-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
75+
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
7676
args:
7777
- --csi-address=$(ADDRESS)
7878
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)

0 commit comments

Comments
 (0)