Merge pull request #70 from utilitywarehouse/apiserver-probes

sys: copy config from upstream
utilitywarehouse · Jan 15, 2019 · 8c5018e · 8c5018e
2 parents ff0cd14 + fd2bc52
commit 8c5018e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/resources/kube-apiserver.yaml b/resources/kube-apiserver.yaml
@@ -49,11 +49,19 @@ spec:
     - --kubelet-client-key=/etc/kubernetes/ssl/apiserver-kubelet-client-key.pem
     - --v=0
     livenessProbe:
+      httpGet:
+        host: 127.0.0.1
+        port: 8080
+        path: /healthz?exclude=etcd
+      # https://github.com/kubernetes/kubernetes/pull/71054/files#diff-e6e5eefc330d75c8ef2e218de62c5fdfR57
+      initialDelaySeconds: 45
+      timeoutSeconds: 15
+    # https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/manifests/kube-apiserver.manifest#L42
+    readinessProbe:
       httpGet:
         host: 127.0.0.1
         port: 8080
         path: /healthz
-      initialDelaySeconds: 15
       timeoutSeconds: 15
     ports:
     - containerPort: 443