github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33791 from euank/coreos-kube-up-dnsmasq

Browse Source 
Automatic merge from submit-queue

gce/coreos: Fix dnsmasq image name

This bug was inadvertently introduced in #32406.

The longer term plan (shouldn't be too much longer) is to remove this
file entirely and rely on the `gci-trusty` version of it, but to stop
some bleeding and allow our jenkins using kube-up + coreos to work, we
should merge this fix until we have the more complete solution.

cc @MrHohn @yifan-gu @thockin
This commit is contained in:
Kubernetes Submit Queue 2016-09-29 17:59:02 -07:00 committed by GitHub
commit 39e6ed812d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
View File

@ -64,7 +64,7 @@ spec:
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/dnsmasq:1.3 image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz-dnsmasq path: /healthz-dnsmasq