diff --git a/cluster/plan.go b/cluster/plan.go index 96ca87a0..eb5aab41 100644 --- a/cluster/plan.go +++ b/cluster/plan.go @@ -150,7 +150,6 @@ func (c *Cluster) BuildKubeAPIProcess(host *hosts.Host, prefixPath string) v3.Pr "requestheader-extra-headers-prefix": "X-Remote-Extra-", "requestheader-group-headers": "X-Remote-Group", "requestheader-username-headers": "X-Remote-User", - "repair-malformed-updates": "false", "secure-port": "6443", "service-account-key-file": pki.GetKeyPath(pki.ServiceAccountTokenKeyName), "service-account-lookup": "true", diff --git a/docker/docker.go b/docker/docker.go index 50844354..ebb7791a 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -40,6 +40,7 @@ var K8sDockerVersions = map[string][]string{ "1.11": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x"}, "1.12": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"}, "1.13": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"}, + "1.14": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"}, } type dockerConfig struct { diff --git a/templates/coredns.go b/templates/coredns.go index 053eb8f8..dc4aed90 100644 --- a/templates/coredns.go +++ b/templates/coredns.go @@ -102,6 +102,7 @@ spec: serviceAccountName: coredns {{- end }} nodeSelector: + beta.kubernetes.io/os: linux {{ range $k, $v := .NodeSelector }} {{ $k }}: {{ $v }} {{ end }} @@ -197,6 +198,8 @@ spec: k8s-app: coredns-autoscaler spec: serviceAccountName: coredns-autoscaler + nodeSelector: + beta.kubernetes.io/os: linux containers: - name: autoscaler image: {{.CoreDNSAutoScalerImage}} @@ -232,7 +235,7 @@ metadata: rules: - apiGroups: [""] resources: ["nodes"] - verbs: ["list"] + verbs: ["list", "watch"] - apiGroups: [""] resources: ["replicationcontrollers/scale"] verbs: ["get", "update"] diff --git a/templates/flannel.go b/templates/flannel.go index da957024..0cdec3a3 100644 --- a/templates/flannel.go +++ b/templates/flannel.go @@ -157,7 +157,7 @@ spec: mountPath: /host/opt/cni/bin/ hostNetwork: true tolerations: - {{- if eq .ClusterVersion "v1.12" }} + {{- if ge .ClusterVersion "v1.12" }} - operator: Exists effect: NoSchedule - operator: Exists diff --git a/templates/kubedns.go b/templates/kubedns.go index c05748ec..dee64723 100644 --- a/templates/kubedns.go +++ b/templates/kubedns.go @@ -60,7 +60,7 @@ metadata: rules: - apiGroups: [""] resources: ["nodes"] - verbs: ["list"] + verbs: ["list", "watch"] - apiGroups: [""] resources: ["replicationcontrollers/scale"] verbs: ["get", "update"] diff --git a/templates/templates.go b/templates/templates.go index 25966f4c..3132e60d 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -9,10 +9,12 @@ import ( var VersionedTemplate = map[string]map[string]string{ "calico": map[string]string{ + "v1.14": CalicoTemplateV113, "v1.13": CalicoTemplateV113, "default": CalicoTemplateV112, }, "canal": map[string]string{ + "v1.14": CanalTemplateV113, "v1.13": CanalTemplateV113, "default": CanalTemplateV112, },