2021-07-14 23:26:25 +00:00
|
|
|
diff -tubNr charts/aws-efs-csi-driver/templates/controller-deployment.yaml charts/aws-efs-csi-driver.zdt/templates/controller-deployment.yaml
|
|
|
|
|
--- charts/aws-efs-csi-driver/templates/controller-deployment.yaml 2021-06-25 22:43:06.000000000 +0200
|
|
|
|
|
+++ charts/aws-efs-csi-driver.zdt/templates/controller-deployment.yaml 2021-07-15 00:37:28.960305011 +0200
|
|
|
|
|
@@ -23,7 +23,6 @@
|
|
|
|
|
annotations: {{- toYaml . | nindent 8 }}
|
|
|
|
|
{{- end }}
|
|
|
|
|
spec:
|
|
|
|
|
- hostNetwork: true
|
|
|
|
|
{{- if .Values.imagePullSecrets }}
|
|
|
|
|
imagePullSecrets:
|
|
|
|
|
{{- range .Values.imagePullSecrets }}
|
|
|
|
|
@@ -57,9 +56,14 @@
|
|
|
|
|
env:
|
|
|
|
|
- name: CSI_ENDPOINT
|
|
|
|
|
value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
|
|
|
|
|
+ {{- if .Values.controller.extraEnv }}
|
|
|
|
|
+{{ toYaml .Values.controller.extraEnv | indent 12 }}
|
|
|
|
|
+ {{- end }}
|
|
|
|
|
volumeMounts:
|
|
|
|
|
- name: socket-dir
|
|
|
|
|
mountPath: /var/lib/csi/sockets/pluginproxy/
|
|
|
|
|
+ - name: aws-token
|
|
|
|
|
+ mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/"
|
|
|
|
|
ports:
|
|
|
|
|
- name: healthz
|
|
|
|
|
containerPort: 9909
|
|
|
|
|
@@ -110,6 +114,13 @@
|
|
|
|
|
volumes:
|
|
|
|
|
- name: socket-dir
|
|
|
|
|
emptyDir: {}
|
|
|
|
|
+ - name: aws-token
|
|
|
|
|
+ projected:
|
|
|
|
|
+ sources:
|
|
|
|
|
+ - serviceAccountToken:
|
|
|
|
|
+ path: token
|
|
|
|
|
+ expirationSeconds: 86400
|
|
|
|
|
+ audience: "sts.amazonaws.com"
|
|
|
|
|
{{- with .Values.controller.affinity }}
|
|
|
|
|
affinity: {{- toYaml . | nindent 8 }}
|
|
|
|
|
{{- end }}
|
|
|
|
|
diff -tubNr charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml
|
|
|
|
|
--- charts/aws-efs-csi-driver/templates/node-daemonset.yaml 2021-06-25 22:43:06.000000000 +0200
|
|
|
|
|
+++ charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml 2021-07-15 00:14:58.680295564 +0200
|
2021-07-01 14:41:31 +00:00
|
|
|
@@ -40,15 +40,10 @@
|
|
|
|
|
{{- with .Values.node.nodeSelector }}
|
|
|
|
|
{{- toYaml . | nindent 8 }}
|
|
|
|
|
{{- end }}
|
|
|
|
|
+ {{- with .Values.node.affinity }}
|
|
|
|
|
affinity:
|
|
|
|
|
- nodeAffinity:
|
|
|
|
|
- requiredDuringSchedulingIgnoredDuringExecution:
|
|
|
|
|
- nodeSelectorTerms:
|
|
|
|
|
- - matchExpressions:
|
|
|
|
|
- - key: eks.amazonaws.com/compute-type
|
|
|
|
|
- operator: NotIn
|
|
|
|
|
- values:
|
|
|
|
|
- - fargate
|
|
|
|
|
+ {{- . | toYaml | nindent 8 }}
|
|
|
|
|
+ {{- end }}
|
|
|
|
|
hostNetwork: true
|
|
|
|
|
dnsPolicy: {{ .Values.node.dnsPolicy }}
|
|
|
|
|
{{- with .Values.node.dnsConfig }}
|
