rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-10 19:22:41 +00:00
Code Issues Releases Wiki Activity

Add k8s 1.14

Browse Source
This commit is contained in:
Sebastiaan van Steenis 2019-04-05 23:19:28 +02:00 committed by Alena Prokharchyk
parent fbf29f208e
commit 21f3a3eff9
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/plan.go
View File

@ -150,7 +150,6 @@ func (c *Cluster) BuildKubeAPIProcess(host *hosts.Host, prefixPath string) v3.Pr
"requestheader-extra-headers-prefix": "X-Remote-Extra-", "requestheader-extra-headers-prefix": "X-Remote-Extra-",
"requestheader-group-headers": "X-Remote-Group", "requestheader-group-headers": "X-Remote-Group",
"requestheader-username-headers": "X-Remote-User", "requestheader-username-headers": "X-Remote-User",
"repair-malformed-updates": "false",
"secure-port": "6443", "secure-port": "6443",
"service-account-key-file": pki.GetKeyPath(pki.ServiceAccountTokenKeyName), "service-account-key-file": pki.GetKeyPath(pki.ServiceAccountTokenKeyName),
"service-account-lookup": "true", "service-account-lookup": "true",

1
docker/docker.go
View File

@ -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.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.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.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 { type dockerConfig struct {

5
templates/coredns.go
View File

@ -102,6 +102,7 @@ spec:
serviceAccountName: coredns serviceAccountName: coredns
{{- end }} {{- end }}
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux
{{ range $k, $v := .NodeSelector }} {{ range $k, $v := .NodeSelector }}
{{ $k }}: {{ $v }} {{ $k }}: {{ $v }}
{{ end }} {{ end }}
@ -197,6 +198,8 @@ spec:
k8s-app: coredns-autoscaler k8s-app: coredns-autoscaler
spec: spec:
serviceAccountName: coredns-autoscaler serviceAccountName: coredns-autoscaler
nodeSelector:
beta.kubernetes.io/os: linux
containers: containers:
- name: autoscaler - name: autoscaler
image: {{.CoreDNSAutoScalerImage}} image: {{.CoreDNSAutoScalerImage}}
@ -232,7 +235,7 @@ metadata:
rules: rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["nodes"] resources: ["nodes"]
verbs: ["list"] verbs: ["list", "watch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["replicationcontrollers/scale"] resources: ["replicationcontrollers/scale"]
verbs: ["get", "update"] verbs: ["get", "update"]

2
templates/flannel.go
View File

@ -157,7 +157,7 @@ spec:
mountPath: /host/opt/cni/bin/ mountPath: /host/opt/cni/bin/
hostNetwork: true hostNetwork: true
tolerations: tolerations:
{{- if eq .ClusterVersion "v1.12" }} {{- if ge .ClusterVersion "v1.12" }}
- operator: Exists - operator: Exists
effect: NoSchedule effect: NoSchedule
- operator: Exists - operator: Exists

2
templates/kubedns.go
View File

@ -60,7 +60,7 @@ metadata:
rules: rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["nodes"] resources: ["nodes"]
verbs: ["list"] verbs: ["list", "watch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["replicationcontrollers/scale"] resources: ["replicationcontrollers/scale"]
verbs: ["get", "update"] verbs: ["get", "update"]

2
templates/templates.go
View File

@ -9,10 +9,12 @@ import (
var VersionedTemplate = map[string]map[string]string{ var VersionedTemplate = map[string]map[string]string{
"calico": map[string]string{ "calico": map[string]string{
"v1.14": CalicoTemplateV113,
"v1.13": CalicoTemplateV113, "v1.13": CalicoTemplateV113,
"default": CalicoTemplateV112, "default": CalicoTemplateV112,
}, },
"canal": map[string]string{ "canal": map[string]string{
"v1.14": CanalTemplateV113,
"v1.13": CanalTemplateV113, "v1.13": CanalTemplateV113,
"default": CanalTemplateV112, "default": CanalTemplateV112,
}, },