From f1727a5c1b1c648348bc3522575417c2133db4df Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian.hacman@sematext.com>
Date: Thu, 2 Jan 2020 10:40:48 +0200
Subject: [PATCH] Fix issues with older versions of k8s for basic clusters

---
 docs/releases/1.18-NOTES.md                        | 14 ++++++++++++++
 .../kube-dns.addons.k8s.io/k8s-1.6.yaml.template   |  3 +--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/releases/1.18-NOTES.md b/docs/releases/1.18-NOTES.md
index ef53004494..bf5831b983 100644
--- a/docs/releases/1.18-NOTES.md
+++ b/docs/releases/1.18-NOTES.md
@@ -6,6 +6,8 @@
 
 * Terraform users on AWS may need to rename some resources in their state file in order to prepare for Terraform 0.12 support. See Required Actions below.
 
+* Kubernetes 1.9 users will need to enable the PodPriority feature gate. See Required Actions below.
+
 * A controller is now used to apply labels to nodes.  If you are not using AWS, GCE or OpenStack your (non-master) nodes may not have labels applied correctly.
 
 * Please see the notes in the 1.15 release about the apiGroup changing from kops to kops.k8s.io
@@ -34,6 +36,18 @@
   terraform apply
   ```
 
+* Kubernetes 1.9 users will need to enable the PodPriority feature gate. This is required for newer versions of Kops.
+
+  To enable the Pod priority feature, follow these steps:
+  ```
+  kops edit cluster
+  # Add the following section
+  spec:
+    kubelet:
+      featureGates:
+        PodPriority: "true"
+  ```
+ 
 * If a custom Kops build was used on a cluster, a kops-controller Deployment may have been created that should get deleted.
   Run `kubectl -n kube-system delete deployment kops-controller` after upgrading to Kops 1.16.0-beta.1 or later.
 
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
index 5fbb8f24a7..97909fd2ec 100644
--- 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