mirror of
https://github.com/rancher/rke.git
synced 2025-07-31 06:49:54 +00:00
Add k8s 1.14
This commit is contained in:
parent
fbf29f208e
commit
21f3a3eff9
@ -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",
|
||||
|
@ -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 {
|
||||
|
@ -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"]
|
||||
|
@ -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
|
||||
|
@ -60,7 +60,7 @@ metadata:
|
||||
rules:
|
||||
- apiGroups: [""]
|
||||
resources: ["nodes"]
|
||||
verbs: ["list"]
|
||||
verbs: ["list", "watch"]
|
||||
- apiGroups: [""]
|
||||
resources: ["replicationcontrollers/scale"]
|
||||
verbs: ["get", "update"]
|
||||
|
@ -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,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user