Merge remote-tracking branch 'kubernetes-incubator/master'

* kubernetes-incubator/master: Fix the creation of all metrics-server resources.
camilb · Nov 24, 2017 · 0ec9f31 · 0ec9f31
2 parents 728e725 + a70782b
commit 0ec9f31
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
@@ -822,7 +822,7 @@ write_files:
 {{ end }}
 
       # Deployments
-      for manifest in {kube-dns,kube-dns-autoscaler,kubernetes-dashboard,{{ if .Addons.ClusterAutoscaler.Enabled }}cluster-autoscaler,{{ end }}heapster{{ if .KubeResourcesAutosave.Enabled }},kube-resources-autosave{{ end }}}; do
+      for manifest in {kube-dns,kube-dns-autoscaler,kubernetes-dashboard,{{ if .Addons.ClusterAutoscaler.Enabled }}cluster-autoscaler,{{ end }}heapster{{ if .KubeResourcesAutosave.Enabled }},kube-resources-autosave{{ end }},metrics-server}; do
           kubectl apply -f "${mfdir}/$manifest-de.yaml"
       done
 
@@ -832,7 +832,7 @@ write_files:
       done
 
       # Services
-      for manifest in {kube-dns,heapster,kubernetes-dashboard}; do
+      for manifest in {kube-dns,heapster,kubernetes-dashboard,metrics-server}; do
           kubectl apply -f "${mfdir}/$manifest-svc.yaml"
       done