Merge pull request eksctl-io#225 from leakingtapan/livenessprobe

Add liveness probe
torredil · Mar 1, 2019 · 084be25 · 084be25
2 parents 4712c94 + f80776c
commit 084be25
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/deploy/kubernetes/controller.yaml b/deploy/kubernetes/controller.yaml
@@ -176,7 +176,6 @@ spec:
       containers:
         - name: ebs-plugin
           image: amazon/aws-ebs-csi-driver:latest
-          imagePullPolicy: Always
           args :
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
@@ -197,8 +196,19 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
+          ports:
+            - name: healthz
+              containerPort: 9808
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 10
+            timeoutSeconds: 3
+            periodSeconds: 10
+            failureThreshold: 5
         - name: cluster-driver-registrar
-          imagePullPolicy: Always
           image: quay.io/k8scsi/csi-cluster-driver-registrar:v1.0.1
           args:
             - --csi-address=$(ADDRESS)
@@ -212,7 +222,6 @@ spec:
               mountPath: /csi
         - name: csi-provisioner
           image: quay.io/k8scsi/csi-provisioner:v1.0.1
-          imagePullPolicy: Always
           args:
             - --provisioner=ebs.csi.aws.com
             - --csi-address=$(ADDRESS)
@@ -226,7 +235,6 @@ spec:
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-attacher
           image: quay.io/k8scsi/csi-attacher:v1.0.1
-          imagePullPolicy: Always
           args:
             - --csi-address=$(ADDRESS)
             - --v=5
@@ -244,10 +252,17 @@ spec:
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: Always
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
+        - name: liveness-probe
+          image: quay.io/k8scsi/livenessprobe:v1.0.1
+          args:
+            - --csi-address=/csi/csi.sock
+            - --connection-timeout=3s
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
       volumes:
         - name: socket-dir
           emptyDir: {}
diff --git a/deploy/kubernetes/node.yaml b/deploy/kubernetes/node.yaml
@@ -21,7 +21,6 @@ spec:
         - name: ebs-plugin
           securityContext:
             privileged: true
-          imagePullPolicy: Always
           image: amazon/aws-ebs-csi-driver:latest
           args:
             - --endpoint=$(CSI_ENDPOINT)
@@ -38,8 +37,19 @@ spec:
               mountPath: /csi
             - name: device-dir
               mountPath: /dev
+          ports:
+            - name: healthz
+              containerPort: 9808
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 10
+            timeoutSeconds: 3
+            periodSeconds: 10
+            failureThreshold: 5
         - name: node-driver-registrar
-          imagePullPolicy: Always
           image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
           args:
             - --csi-address=$(ADDRESS)
@@ -59,6 +69,14 @@ spec:
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
+        - name: liveness-probe
+          image: quay.io/k8scsi/livenessprobe:v1.0.1
+          args:
+            - --csi-address=/csi/csi.sock
+            - --connection-timeout=3s
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
       volumes:
         - name: kubelet-dir
           hostPath: