Merge pull request #8377 from rifelpet/automated-cherry-pick-of-#8248…

…-origin-release-1.15 Automated cherry pick of #8248: Fix issues with older versions of k8s for basic clusters
kubernetes · Jan 23, 2020 · df19aa4 · df19aa4
2 parents 51a0fe2 + 7742de9
commit df19aa4
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 {{- if or (.KubeDNS.UpstreamNameservers) (.KubeDNS.StubDomains) }}
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -28,9 +27,9 @@ data:
   stubDomains: |
     {{ ToJSON .KubeDNS.StubDomains }}
   {{- end }}
-{{- end }}
 
 ---
+{{- end }}
 
 apiVersion: extensions/v1beta1
 kind: Deployment