diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index c23002640..29e82e5b1 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -108,6 +108,28 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys resources: +{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} + - name: liveness-prometheus + image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" + args: + - "--type=liveness" + - "--endpoint=$(CSI_ENDPOINT)" + - "--livenessport=8081" + - "--livenesspath=/metrics" + - "--polltime=60s" + - "--timeout=3s" + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} + env: + - name: CSI_ENDPOINT + value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + volumeMounts: + - name: plugin-dir + mountPath: {{ .Values.socketDir }} + resources: {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} volumes: - name: mount-cache-dir diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-deployment.yaml index d204e0463..ef49d3e2d 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -98,6 +98,28 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys resources: +{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} + - name: liveness-prometheus + image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" + args: + - "--type=liveness" + - "--endpoint=$(CSI_ENDPOINT)" + - "--livenessport=8081" + - "--livenesspath=/metrics" + - "--polltime=60s" + - "--timeout=3s" + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} + env: + - name: CSI_ENDPOINT + value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + volumeMounts: + - name: socket-dir + mountPath: {{ .Values.socketDir }} + resources: {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} volumes: - name: socket-dir diff --git a/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-statefulset.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-statefulset.yaml index a603d167e..6d595b066 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-statefulset.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-statefulset.yaml @@ -135,6 +135,28 @@ spec: - name: socket-dir mountPath: {{ .Values.socketDir }} resources: +{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} + - name: liveness-prometheus + image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" + args: + - "--type=liveness" + - "--endpoint=$(CSI_ENDPOINT)" + - "--livenessport=8081" + - "--livenesspath=/metrics" + - "--polltime=60s" + - "--timeout=3s" + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} + env: + - name: CSI_ENDPOINT + value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + volumeMounts: + - name: socket-dir + mountPath: {{ .Values.socketDir }} + resources: {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} volumes: - name: socket-dir diff --git a/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index 06b1f75c5..95e3dfbbf 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -107,6 +107,28 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys resources: +{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} + - name: liveness-prometheus + image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" + args: + - "--type=liveness" + - "--endpoint=$(CSI_ENDPOINT)" + - "--livenessport=8081" + - "--livenesspath=/metrics" + - "--polltime=60s" + - "--timeout=3s" + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} + env: + - name: CSI_ENDPOINT + value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + volumeMounts: + - name: plugin-dir + mountPath: {{ .Values.socketDir }} + resources: {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} volumes: - name: socket-dir