Merge "Revert "Add Liveness/Readiness probe to calico-etcd.""

charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl

@@ -98,16 +98,6 @@ spec:
           value: https://$(POD_IP):{{ .Values.network.service_peer.target_port }}
         - name: MANIFEST_PATH
           value: /manifests/{{ .Values.service.name }}.yaml
-      readinessProbe:
-        exec:
-          command:
-             - /tmp/bin/readiness
-{{ toYaml .Values.readinessProbe.config | indent 8 }}
-      livenessProbe:
-        exec:
-          command:
-             - /tmp/bin/readiness
-{{ toYaml .Values.livenessProbe.config | indent 8 }}
       volumeMounts:
         - name: data
           mountPath: /var/lib/etcd

charts/etcd/values.yaml

@@ -143,18 +143,6 @@ pod:
           memory: "128Mi"
           cpu: "100m"
 
-livenessProbe:
-  config:
-    failureThreshold: 10
-    initialDelaySeconds: 15
-    periodSeconds: 30
-
-readinessProbe:
-  config:
-    failureThreshold: 10
-    initialDelaySeconds: 15
-    periodSeconds: 30
-
 jobs:
   etcd_backup:
     cron: "0 */12 * * *"