Merge pull request #15570 from ArtfulCoder/dnstest

New SkyDNS build (Oct 13, 2015, 8c72f8c).
This commit is contained in:
Abhi Shah 2015-10-13 15:34:40 -07:00
commit c2a0a4b9db

View File

@ -49,7 +49,7 @@ spec:
# command = "/kube2sky" # command = "/kube2sky"
- -domain={{ pillar['dns_domain'] }} - -domain={{ pillar['dns_domain'] }}
- name: skydns - name: skydns
image: gcr.io/google_containers/skydns:2015-03-11-001 image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
@ -58,7 +58,7 @@ spec:
# command = "/skydns" # command = "/skydns"
- -machines=http://localhost:4001 - -machines=http://localhost:4001
- -addr=0.0.0.0:53 - -addr=0.0.0.0:53
- -rtimeout=1s - -ns-rotate=false
- -domain={{ pillar['dns_domain'] }}. - -domain={{ pillar['dns_domain'] }}.
ports: ports:
- containerPort: 53 - containerPort: 53