Merge pull request #13172 from parikhyash/kube-dns-ha

#11471 Readiness probe for kube-dns RC (HA)
2015-09-04 09:08:08 -07:00 · 2015-09-04 09:08:08 -07:00 · 27c4041778
parent ded8569524 207dfe54f0
commit 27c4041778
1 changed files with 11 additions and 4 deletions
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@ -1,22 +1,22 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v8
+  name: kube-dns-v9
  namespace: kube-system
  labels:
    k8s-app: kube-dns
-    version: v8
+    version: v9
    kubernetes.io/cluster-service: "true"
 spec:
  replicas: {{ pillar['dns_replicas'] }}
  selector:
    k8s-app: kube-dns
-    version: v8
+    version: v9
  template:
    metadata:
      labels:
        k8s-app: kube-dns
-        version: v8
+        version: v9
        kubernetes.io/cluster-service: "true"
    spec:
      containers:
@ -73,6 +73,13 @@ spec:
            scheme: HTTP
          initialDelaySeconds: 30
          timeoutSeconds: 5
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 1
+          timeoutSeconds: 5
      - name: healthz
        image: gcr.io/google_containers/exechealthz:1.0
        resources: