github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

coredns to use gcr.io repo

Browse Source
This commit is contained in:
Sandeep Rajan 2018-06-05 11:08:11 -04:00
parent fa20f87f1f
commit fce42e0bf6
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubeadm/app/phases/addons/dns/dns.go
View File

@ -161,9 +161,10 @@ func createKubeDNSAddon(deploymentBytes, serviceBytes []byte, client clientset.I
func coreDNSAddon(cfg *kubeadmapi.MasterConfiguration, client clientset.Interface, k8sVersion *version.Version) error { func coreDNSAddon(cfg *kubeadmapi.MasterConfiguration, client clientset.Interface, k8sVersion *version.Version) error {
// Get the YAML manifest conditionally based on the k8s version // Get the YAML manifest conditionally based on the k8s version
dnsDeploymentBytes := GetCoreDNSManifest(k8sVersion) dnsDeploymentBytes := GetCoreDNSManifest(k8sVersion)
coreDNSDeploymentBytes, err := kubeadmutil.ParseTemplate(dnsDeploymentBytes, struct{ MasterTaintKey, Version string }{ coreDNSDeploymentBytes, err := kubeadmutil.ParseTemplate(dnsDeploymentBytes, struct{ ImageRepository, MasterTaintKey, Version string }{
MasterTaintKey: kubeadmconstants.LabelNodeRoleMaster, ImageRepository: cfg.ImageRepository,
Version: GetDNSVersion(k8sVersion, kubeadmconstants.CoreDNS), MasterTaintKey: kubeadmconstants.LabelNodeRoleMaster,
Version: GetDNSVersion(k8sVersion, kubeadmconstants.CoreDNS),
}) })
if err != nil { if err != nil {
return fmt.Errorf("error when parsing CoreDNS deployment template: %v", err) return fmt.Errorf("error when parsing CoreDNS deployment template: %v", err)

7
cmd/kubeadm/app/phases/addons/dns/dns_test.go
View File

@ -115,9 +115,10 @@ func TestCompileManifests(t *testing.T) {
}, },
{ {
manifest: CoreDNSDeployment, manifest: CoreDNSDeployment,
data: struct{ MasterTaintKey, Version string }{ data: struct{ ImageRepository, MasterTaintKey, Version string }{
MasterTaintKey: "foo", ImageRepository: "foo",
Version: "foo", MasterTaintKey: "foo",
Version: "foo",
}, },
expected: true, expected: true,
}, },

2
cmd/kubeadm/app/phases/addons/dns/manifests.go
View File

@ -247,7 +247,7 @@ spec:
effect: NoSchedule effect: NoSchedule
containers: containers:
- name: coredns - name: coredns
image: coredns/coredns:{{ .Version }} image: {{ .ImageRepository }}/coredns:{{ .Version }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits: