Fix issues with older versions of k8s for basic clusters

kubernetes · Jan 2, 2020 · dfbfc87 · dfbfc87
1 parent 81d4cf6
commit dfbfc87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go
@@ -249,6 +249,11 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 			clusterSpec.Kubelet.FeatureGates["ExperimentalCriticalPodAnnotation"] = "true"
 		}
 	}
+	if _, found := clusterSpec.Kubelet.FeatureGates["PodPriority"]; !found {
+		if b.Context.IsKubernetesGTE("1.8.0") && b.Context.IsKubernetesLT("1.11") {
+			clusterSpec.Kubelet.FeatureGates["PodPriority"] = "true"
+		}
+	}
 
 	return nil
 }
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