Skip to content

Commit

Permalink
Squashed 'aws-ebs-csi-driver/' changes from 4790c45471..ee3b46c279
Browse files Browse the repository at this point in the history
ee3b46c279 Merge pull request #776 from AndyXiangLi/not-tolerate-all-taint
daa2555262 Merge pull request #778 from tsunny/tsunny/remove-prestophook
a724307db1 add toleration time to NoExecute effect
1dbc8acfcd Merge pull request #777 from vdhanan/lockfile
6e59160eea Removing prestop hook for node-driver-registrar
7c1de6f013 go mod tidy
f013880f63 Merge pull request #774 from AndyXiangLi/add-self-as-approver
bc33f06696 add self as reviewer
c07e65470a Merge pull request #751 from vdhanan/master
1e644f81d6 Merge remote-tracking branch 'upstream/master'
25c0e590e5 add readiness probe and bump helm chart version
a3a0bc328e Merge pull request #768 from people-ai/master
75038e8d1b Merge branch 'master' into master
5241bed348 Merge pull request #772 from ayberk/patch-4
208bcf0172 Update chart version
ca5d05e54b Merge pull request #770 from arcivanov/chart_tscs
c159142a35 Merge pull request #765 from rubroboletus/master
1ca1f8bf25 Merge pull request #762 from nvnmandadhi/master
69000c93c6 Merge pull request #771 from AndyXiangLi/delete-volume-on-leak
fc70a3846f Merge pull request #756 from mowangdk/upgrade_livenessprobe_version
5b2faf99c7 delete leaked volume if driver don't know the volume status
0bdb9a6ed3 Bumped chart version
5b31c9334b Merge pull request #767 from jsafrane/fix-iops-param-error
25193d74c3 Add ability to specify topologySpreadConstraints
dd696f1f23 Merge pull request #769 from josselin-c/master
1ef44be8c4 Aws client config: increase MaxRetries
ea61adeffa Fix error message when IOPSPerGB is missing in io1 volumes
ffed9c62b7 Allow setting http proxy and no proxy environment values
341eb8b77f removed harcoded NAMESPACE
4d783ddaae Update livenessprobe image version from 2.1.0 to 2.2.0
69535ad954 Merge pull request #755 from mtougeron/image-pull-secrets
7cf4d1b3d3 add a document separator for storageclass template file
ae12a26bf9 Merge pull request #759 from ayberk/patch-4
7d5601786a Update test k8s version to 1.18.16
40ab0bd52f Use the imagePullSecrets if set
6b8257af1d Merge pull request #752 from mtougeron/helm-set-default-enableVolumeScheduling-to-true
061a9c5f2d bump the chart version
786dbfa5e5 Merge branch 'master' into helm-set-default-enableVolumeScheduling-to-true
2c7a0d127a Merge pull request #702 from AndyXiangLi/node-concurrent-issue
5828d42515 Merge pull request #734 from nicholasmhughes/add-storage-class-annotations
8171f836db Merge branch 'master' into add-storage-class-annotations
bebc32bfa5 closes kubernetes-sigs/aws-ebs-csi-driver#733; add storage class annotation and label handling to chart
8155fe8ed4 Refactor inFlight key to add lock per volumeId for node service
1a15fcc8ff Merge pull request #744 from chrishenzie/create-volume-idempotency
7556d0baeb Set enableVolumeScheduling to true by default in the helm chart
8cf86b7c42 Make CreateVolume idempotent
c547161652 Merge pull request #711 from ig0rsky/master
78d23ca81c add snapshot controller variables
85699e170f Merge pull request #745 from ayberk/ecr_overlay
e2de85d3a4 Update ECR overlay
21fe2a87d3 Merge pull request #742 from AndyXiangLi/update-gcr-image-kustomization
41d8f2e262 correct kustomization gcr image repo
f5172422f6 Merge pull request #740 from AndyXiangLi/update-gcr-image-kustomization
288c177395 patch stable release to use gcr image
62ebcbfa83 Merge pull request #735 from PhilThurston/patch-1
d22d0db501 Merge pull request #732 from dntosas/allow-resources-override-for-node
5b1bb6a972 Updated installation to use latest 0.9 release
5a03305031 [chart] Ability to add priorityClassName
f3a57d3042 [chart] Allow resources override for node DaemonSet

git-subtree-dir: aws-ebs-csi-driver
git-subtree-split: ee3b46c279b57ee778b604a686168caa6764432b
ArchiFleKs committed Mar 5, 2021
1 parent dd33c68 commit 5e5163c
Showing 34 changed files with 602 additions and 229 deletions.
2 changes: 2 additions & 0 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ approvers:
- leakingtapan
- wongma7
- ayberk
- AndyXiangLi
reviewers:
- bertinatto
- jsafrane
@@ -16,3 +17,4 @@ reviewers:
- leakingtapan
- wongma7
- ayberk
- AndyXiangLi
2 changes: 1 addition & 1 deletion charts/aws-ebs-csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "0.9.0"
name: aws-ebs-csi-driver
description: A Helm chart for AWS EBS CSI Driver
version: 0.9.4
version: 0.9.14
kubeVersion: ">=1.17.0-0"
home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
sources:
2 changes: 1 addition & 1 deletion charts/aws-ebs-csi-driver/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
To verify that aws-ebs-csi-driver has started, run:

kubectl get pod -n kube-system -l "app.kubernetes.io/name={{ include "aws-ebs-csi-driver.name" . }},app.kubernetes.io/instance={{ .Release.Name }}"
kubectl get pod -n {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "aws-ebs-csi-driver.name" . }},app.kubernetes.io/instance={{ .Release.Name }}"
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.controller.name }}
namespace: kube-system
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: ebs-external-attacher-role
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.controller.name }}
namespace: kube-system
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: ebs-external-provisioner-role
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.controller.name }}
namespace: kube-system
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: ebs-external-resizer-role
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.snapshot.name }}
namespace: kube-system
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: ebs-snapshot-controller-role
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.controller.name }}
namespace: kube-system
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: ebs-external-snapshotter-role
70 changes: 68 additions & 2 deletions charts/aws-ebs-csi-driver/templates/controller.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ kind: Deployment
apiVersion: apps/v1
metadata:
name: ebs-csi-controller
namespace: kube-system
labels:
{{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
spec:
@@ -27,17 +26,30 @@ spec:
{{ toYaml . | indent 8 }}
{{- end }}
serviceAccountName: {{ .Values.serviceAccount.controller.name }}
priorityClassName: system-cluster-critical
priorityClassName: {{ .Values.priorityClassName | default "system-cluster-critical" }}
{{- with .Values.affinity }}
affinity: {{ toYaml . | nindent 8 }}
{{- end }}
tolerations:
{{- if .Values.tolerateAllTaints }}
- operator: Exists
{{- else }}
- key: CriticalAddonsOnly
operator: Exists
- operator: Exists
effect: NoExecute
tolerationSeconds: 300
{{- end }}
{{- with .Values.tolerations }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- if .Values.topologySpreadConstraints }}
{{- $tscLabelSelector := dict "labelSelector" ( dict "matchLabels" ( dict "app" "ebs-csi-controller" ) ) }}
topologySpreadConstraints:
{{- range .Values.topologySpreadConstraints }}
- {{ mergeOverwrite . $tscLabelSelector | toJson }}
{{- end }}
{{- end }}
containers:
- name: ebs-plugin
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -76,6 +88,14 @@ spec:
- name: AWS_REGION
value: {{ .Values.region }}
{{- end }}
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: NO_PROXY
value: {{ .Values.proxy.no_proxy | quote }}
{{- end }}
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -91,6 +111,14 @@ spec:
timeoutSeconds: 3
periodSeconds: 10
failureThreshold: 5
readinessProbe:
httpGet:
path: /healthz
port: healthz
initialDelaySeconds: 10
timeoutSeconds: 3
periodSeconds: 10
failureThreshold: 5
{{- with .Values.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
@@ -110,6 +138,14 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: NO_PROXY
value: {{ .Values.proxy.no_proxy | quote }}
{{- end }}
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -125,6 +161,14 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: NO_PROXY
value: {{ .Values.proxy.no_proxy | quote }}
{{- end }}
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -140,6 +184,14 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: NO_PROXY
value: {{ .Values.proxy.no_proxy | quote }}
{{- end }}
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -157,6 +209,14 @@ spec:
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: NO_PROXY
value: {{ .Values.proxy.no_proxy | quote }}
{{- end }}
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -174,6 +234,12 @@ spec:
{{- with .Values.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- range .Values.imagePullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
volumes:
- name: socket-dir
emptyDir: {}
53 changes: 47 additions & 6 deletions charts/aws-ebs-csi-driver/templates/node.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ kind: DaemonSet
apiVersion: apps/v1
metadata:
name: ebs-csi-node
namespace: kube-system
labels:
{{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
spec:
@@ -36,10 +35,16 @@ spec:
{{- end }}
hostNetwork: true
serviceAccountName: {{ .Values.serviceAccount.node.name }}
priorityClassName: system-node-critical
priorityClassName: {{ .Values.node.priorityClassName | default "system-cluster-critical" }}
tolerations:
{{- if .Values.node.tolerateAllTaints }}
- operator: Exists
{{- else }}
- key: CriticalAddonsOnly
operator: Exists
- operator: Exists
effect: NoExecute
tolerationSeconds: 300
{{- end }}
{{- with .Values.node.tolerations }}
{{ toYaml . | indent 8 }}
@@ -60,6 +65,14 @@ spec:
env:
- name: CSI_ENDPOINT
value: unix:/csi/csi.sock
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: NO_PROXY
value: {{ .Values.proxy.no_proxy | quote }}
{{- end }}
volumeMounts:
- name: kubelet-dir
mountPath: /var/lib/kubelet
@@ -80,42 +93,70 @@ spec:
timeoutSeconds: 3
periodSeconds: 10
failureThreshold: 5
{{- if .Values.node.resources }}
{{- with .Values.node.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- else }}
{{- with .Values.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- end }}
- name: node-driver-registrar
image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }}
args:
- --csi-address=$(ADDRESS)
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
- --v=5
lifecycle:
preStop:
exec:
command: ["/bin/sh", "-c", "rm -rf /registration/ebs.csi.aws.com-reg.sock /csi/csi.sock"]
env:
- name: ADDRESS
value: /csi/csi.sock
- name: DRIVER_REG_SOCK_PATH
value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
- name: NO_PROXY
value: {{ .Values.proxy.no_proxy | quote }}
{{- end }}
volumeMounts:
- name: plugin-dir
mountPath: /csi
- name: registration-dir
mountPath: /registration
{{- if .Values.node.resources }}
{{- with .Values.node.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- else }}
{{- with .Values.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- end }}
- name: liveness-probe
image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }}
args:
- --csi-address=/csi/csi.sock
volumeMounts:
- name: plugin-dir
mountPath: /csi
{{- if .Values.node.resources }}
{{- with .Values.node.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- else }}
{{- with .Values.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- range .Values.imagePullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
volumes:
- name: kubelet-dir
hostPath:
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: ebs-snapshot-controller-leaderelection
namespace: kube-system
labels:
{{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
rules:
Original file line number Diff line number Diff line change
@@ -4,13 +4,12 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: ebs-snapshot-controller-leaderelection
namespace: kube-system
labels:
{{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.snapshot.name }}
namespace: kube-system
namespace: {{ .Release.Namespace }}
roleRef:
kind: Role
name: ebs-snapshot-controller-leaderelection
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount.controller.name }}
namespace: kube-system
labels:
{{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.controller.annotations }}
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount.node.name }}
namespace: kube-system
labels:
{{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.node.annotations }}
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccount.snapshot.name }}
namespace: kube-system
labels:
{{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.snapshot.annotations }}
Loading

0 comments on commit 5e5163c

Please sign in to comment.