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

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

Merge pull request #33791 from euank/coreos-kube-up-dnsmasq
39e6ed81 · Kubernetes Submit Queue · GitHub · 54ab8609 · 22b6fd89 · 39e6ed81
Commit 39e6ed81 authored Sep 29, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

skydns-rc.yaml cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml +1 -1

No files found.
--- a/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
@@ -64,7 +64,7 @@ spec:
          name: dns-tcp-local
          protocol: TCP
      - name: dnsmasq
-        image: gcr.io/google_containers/dnsmasq:1.3
+        image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
        livenessProbe:
          httpGet:
            path: /healthz-dnsmasq