From f17df6e768b7c1e95d10cd36a22170660a1516f1 Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Sat, 13 Mar 2021 12:15:49 +0000
Subject: [PATCH] feat: add liveness probe helthz port

---
 charts/latest/csi-driver-nfs-v3.0.0.tgz       | Bin 2798 -> 3000 bytes
 .../csi-driver-nfs/templates/_helpers.tpl     |  15 ++++++++++-----
 .../templates/csi-nfs-controller.yaml         |  12 ++++++++++++
 .../templates/csi-nfs-node.yaml               |  12 ++++++++++++
 deploy/csi-nfs-controller.yaml                |  12 ++++++++++++
 deploy/csi-nfs-node.yaml                      |  12 ++++++++++++
 6 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/charts/latest/csi-driver-nfs-v3.0.0.tgz b/charts/latest/csi-driver-nfs-v3.0.0.tgz
index 39fec2bf36cc2e8a5eaf52a86d54eab747b971e5..899f5a98ab888c9245a02554e5f41057b4a6d926 100644
GIT binary patch
delta 2970
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
QKL7y#|5!GdI{-`o0D582!vFvP

delta 2766
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
UOFKLN2><~9|G_}<FaSmX06b=C-T(jq

diff --git a/charts/latest/csi-driver-nfs/templates/_helpers.tpl b/charts/latest/csi-driver-nfs/templates/_helpers.tpl
index 9e730b70..62c53482 100755
--- a/charts/latest/csi-driver-nfs/templates/_helpers.tpl
+++ b/charts/latest/csi-driver-nfs/templates/_helpers.tpl
@@ -1,11 +1,16 @@
 {{/* vim: set filetype=mustache: */}}
 
+{{/* Expand the name of the chart.*/}}
+{{- define "nfs.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/* labels for helm resources */}}
 {{- define "nfs.labels" -}}
 labels:
-  heritage: "{{ .Release.Service }}"
-  release: "{{ .Release.Name }}"
-  revision: "{{ .Release.Revision }}"
-  chart: "{{ .Chart.Name }}"
-  chartVersion: "{{ .Chart.Version }}"
+  app.kubernetes.io/instance: "{{ .Release.Name }}"
+  app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+  app.kubernetes.io/name: "{{ template "nfs.name" . }}"
+  app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+  helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{- end -}}
\ No newline at end of file
diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
index af46951d..b6673d61 100755
--- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
+++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
@@ -87,6 +87,18 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
+          ports:
+            - containerPort: 29652
+              name: healthz
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 5
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 30
+            timeoutSeconds: 10
+            periodSeconds: 30
           volumeMounts:
             - name: pods-mount-dir
               mountPath: /var/lib/kubelet/pods
diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml
index c53d6196..f4234283 100755
--- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml
+++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml
@@ -77,6 +77,18 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
+          ports:
+            - containerPort: 29653
+              name: healthz
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 5
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 30
+            timeoutSeconds: 10
+            periodSeconds: 30
           imagePullPolicy: {{ .Values.image.nfs.pullPolicy }}
           volumeMounts:
             - name: socket-dir
diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml
index 05324031..56d78995 100644
--- a/deploy/csi-nfs-controller.yaml
+++ b/deploy/csi-nfs-controller.yaml
@@ -81,6 +81,18 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
+          ports:
+            - containerPort: 29652
+              name: healthz
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 5
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 30
+            timeoutSeconds: 10
+            periodSeconds: 30
           volumeMounts:
             - name: pods-mount-dir
               mountPath: /var/lib/kubelet/pods
diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml
index 5f4184c7..7e850f3c 100644
--- a/deploy/csi-nfs-node.yaml
+++ b/deploy/csi-nfs-node.yaml
@@ -75,6 +75,18 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
+          ports:
+            - containerPort: 29653
+              name: healthz
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 5
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 30
+            timeoutSeconds: 10
+            periodSeconds: 30
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir