Fix 1.8 cluster config (#4200)

Azure · Nov 7, 2018 · 71a1741 · 71a1741
1 parent 31d660d
commit 71a1741
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/parts/k8s/addons/1.7/kubernetesmasteraddons-kube-dns-deployment.yaml b/parts/k8s/addons/1.7/kubernetesmasteraddons-kube-dns-deployment.yaml
@@ -155,7 +155,7 @@ spec:
         env:
         - name: PROBE_DOMAINS
           value: bing.com kubernetes.default.svc.<domain>
-        image: <img>
+        image: <imgHealthz>
         livenessProbe:
           failureThreshold: 5
           httpGet:

diff --git a/parts/k8s/addons/1.8/kubernetesmasteraddons-kube-dns-deployment.yaml b/parts/k8s/addons/1.8/kubernetesmasteraddons-kube-dns-deployment.yaml
@@ -155,7 +155,7 @@ spec:
         env:
         - name: PROBE_DOMAINS
           value: bing.com kubernetes.default.svc.<domain>
-        image: <img>
+        image: <imgHealthz>
         livenessProbe:
           failureThreshold: 5
           httpGet:

diff --git a/parts/k8s/kubernetesmastercustomdata.yml b/parts/k8s/kubernetesmastercustomdata.yml
@@ -294,7 +294,7 @@ MASTER_ARTIFACTS_CONFIG_PLACEHOLDER
     sed -i "s|<img>|{{WrapAsParameter "kubernetesHyperkubeSpec"}}|g; s|<CIDR>|{{WrapAsParameter "kubeClusterCidr"}}|g" /etc/kubernetes/addons/kube-proxy-daemonset.yaml
     KUBEDNS=/etc/kubernetes/addons/kube-dns-deployment.yaml
 {{if NeedsKubeDNSWithExecHealthz}}
-    sed -i "s|<img>|{{WrapAsParameter "kubernetesKubeDNSSpec"}}|g; s|<imgMasq>|{{WrapAsParameter "kubernetesDNSMasqSpec"}}|g; s|<img>|{{WrapAsParameter "kubernetesExecHealthzSpec"}}|g; s|<imgSidecar>|{{WrapAsParameter "kubernetesDNSSidecarSpec"}}|g; s|<domain>|{{WrapAsParameter "kubernetesKubeletClusterDomain"}}|g; s|<clustIP>|{{WrapAsParameter "kubeDNSServiceIP"}}|g" $KUBEDNS
+    sed -i "s|<img>|{{WrapAsParameter "kubernetesKubeDNSSpec"}}|g; s|<imgMasq>|{{WrapAsParameter "kubernetesDNSMasqSpec"}}|g; s|<imgHealthz>|{{WrapAsParameter "kubernetesExecHealthzSpec"}}|g; s|<imgSidecar>|{{WrapAsParameter "kubernetesDNSSidecarSpec"}}|g; s|<domain>|{{WrapAsParameter "kubernetesKubeletClusterDomain"}}|g; s|<clustIP>|{{WrapAsParameter "kubeDNSServiceIP"}}|g" $KUBEDNS
 {{else if IsKubernetesVersionGe "1.12.0"}}
     sed -i "s|<img>|{{WrapAsParameter "kubernetesCoreDNSSpec"}}|g; s|<domain>|{{WrapAsParameter "kubernetesKubeletClusterDomain"}}|g; s|<clustIP>|{{WrapAsParameter "kubeDNSServiceIP"}}|g" /etc/kubernetes/addons/coredns.yaml
 {{else}}