Merge pull request #10939 from zmerlynn/automated-cherry-pick-of-#10884-on-upstream-release-0.21

Automated cherry pick of #10884 on upstream release 0.21
2025-08-09 03:57:41 +00:00 · 2015-07-08 16:06:23 -07:00 · 2015-07-08 16:06:23 -07:00 · 39c31bab40
commit 39c31bab40
parent f4a8727642 940e555cdf
1 changed files with 4 additions and 12 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-v5
+  name: kube-dns-v6
  namespace: kube-system
  labels:
    k8s-app: kube-dns
-    version: v5
+    version: v6
    kubernetes.io/cluster-service: "true"
 spec:
  replicas: {{ pillar['dns_replicas'] }}
  selector:
    k8s-app: kube-dns
-    version: v5
+    version: v6
  template:
    metadata:
      labels:
        k8s-app: kube-dns
-        version: v5
+        version: v6
        kubernetes.io/cluster-service: "true"
    spec:
      containers:
@ -61,12 +61,4 @@ spec:
        - containerPort: 53
          name: dns-tcp
          protocol: TCP
-        livenessProbe:
-          exec:
-            command:
-            - /bin/sh
-            - -c
-            - nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} localhost >/dev/null
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
      dnsPolicy: Default  # Don't use cluster DNS.