Merge 47bd33d into 61e2d92

kubernetes-sigs · May 4, 2021 · 293c470 · 293c470
2 parents 61e2d92 + 47bd33d
commit 293c470
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/charts/aws-efs-csi-driver/Chart.yaml b/charts/aws-efs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.2.0"
 name: aws-efs-csi-driver
 description: A Helm chart for AWS EFS CSI Driver
-version: 1.2.4
+version: 1.2.5
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver
 sources:

diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -23,7 +23,7 @@ spec:
       annotations: {{ toYaml .Values.node.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
-      hostNetwork: true 
+      hostNetwork: {{ .Values.controller.hostNetwork }}
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- range .Values.imagePullSecrets }}
@@ -64,7 +64,7 @@ spec:
               mountPath: /var/lib/csi/sockets/pluginproxy/
           ports:
             - name: healthz
-              containerPort: 9808
+              containerPort: {{ .Values.controller.port }}
               protocol: TCP
           livenessProbe:
             httpGet:
@@ -91,7 +91,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }}
           args:
             - --csi-address=/csi/csi.sock
-            - --health-port=9808
+            - --health-port={{ .Values.controller.port }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi

diff --git a/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/aws-efs-csi-driver/templates/node-daemonset.yaml
@@ -49,7 +49,7 @@ spec:
                 operator: NotIn
                 values:
                 - fargate
-      hostNetwork: true
+      hostNetwork: {{ .Values.node.hostNetwork }}
       {{- if .Values.dnsPolicy }}
       dnsPolicy: "{{ .Values.dnsPolicy }}"
       {{- end }}
@@ -89,7 +89,7 @@ spec:
               mountPath: /etc/amazon/efs-legacy
           ports:
             - name: healthz
-              containerPort: 9809
+              containerPort: {{ .Values.node.port }}
               protocol: TCP
           livenessProbe:
             httpGet:
@@ -123,7 +123,7 @@ spec:
           image: {{ printf "%s:%s" .Values.sidecars.livenessProbeImage.repository .Values.sidecars.livenessProbeImage.tag }}
           args:
             - --csi-address=/csi/csi.sock
-            - --health-port=9809
+            - --health-port={{ .Values.node.port }}
             - --v={{ .Values.logLevel }}
           volumeMounts:
             - name: plugin-dir

diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -46,7 +46,9 @@ tolerations: []
 affinity: {}
 
 node:
+  hostNetwork: true
   podAnnotations: {}
+  port: 9809
   tolerations: []
 
 logLevel: 2
@@ -90,6 +92,8 @@ controller:
   # Enable if you want the controller to also delete the
   # path on efs when deleteing an access point
   deleteAccessPointRootDir: false
+  hostNetwork: true
+  port: 9909
 
 storageClasses: []
 # Add StorageClass resources like: