Commit 39c31bab authored by Zach Loafman's avatar Zach Loafman

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
parents f4a87276 940e555c
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.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment