rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-07-05 19:47:47 +00:00
Code Issues Releases Wiki Activity

vendor update metadata

Browse Source
This commit is contained in:
kinarashah 2019-07-15 10:57:23 -07:00 committed by Alena Prokharchyk
parent 958042817a
commit e1e98a84d8
7 changed files with 55 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -30,4 +30,4 @@ github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ad
github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1 github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1
github.com/rancher/types 7c47f85c089c16fb312ad12c96ea09478a5d6d99 github.com/rancher/types 7c47f85c089c16fb312ad12c96ea09478a5d6d99
github.com/rancher/kontainer-driver-metadata 949885dc589573e2fd8ee3a72ec70b6c5226384d github.com/rancher/kontainer-driver-metadata 44d4ac44d186344d93735ee30c5f7d1266b4ea69

3
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_defaults.go generated vendored
View File

@ -35,6 +35,8 @@ type Data struct {
//Default K8s version for every rke version //Default K8s version for every rke version
RKEDefaultK8sVersions map[string]string RKEDefaultK8sVersions map[string]string
K8sVersionDockerInfo map[string][]string
K8sVersionWindowsSystemImages map[string]v3.WindowsSystemImages K8sVersionWindowsSystemImages map[string]v3.WindowsSystemImages
K8sVersionWindowsServiceOptions map[string]v3.KubernetesServicesOptions K8sVersionWindowsServiceOptions map[string]v3.KubernetesServicesOptions
} }
@ -73,6 +75,7 @@ func init() {
// init Windows versions // init Windows versions
DriverData.K8sVersionWindowsSystemImages = loadK8sVersionWindowsSystemimages() DriverData.K8sVersionWindowsSystemImages = loadK8sVersionWindowsSystemimages()
DriverData.K8sVersionWindowsServiceOptions = loadK8sVersionWindowsServiceOptions() DriverData.K8sVersionWindowsServiceOptions = loadK8sVersionWindowsServiceOptions()
DriverData.K8sVersionDockerInfo = loadK8sVersionDockerInfo()
DriverData.RancherDefaultK8sVersions = loadRancherDefaultK8sVersions() DriverData.RancherDefaultK8sVersions = loadRancherDefaultK8sVersions()

13
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_docker_info.go generated vendored Normal file
View File

@ -0,0 +1,13 @@
package rke
func loadK8sVersionDockerInfo() map[string][]string {
return map[string][]string{
"1.8": {"1.11.x", "1.12.x", "1.13.x", "17.03.x"},
"1.9": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x"},
"1.10": {"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.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"},
"1.15": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"},}
}

9
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go generated vendored
View File

@ -1015,11 +1015,12 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"),
CalicoNode: m("quay.io/calico/node:v3.7.3"), CalicoNode: m("quay.io/calico/node:v3.7.4"),
CalicoCNI: m("quay.io/calico/cni:v3.7.3"), CalicoCNI: m("quay.io/calico/cni:v3.7.4"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.7.3"), CalicoControllers: m("quay.io/calico/kube-controllers:v3.7.4"),
CanalCNI: m("quay.io/calico/cni:v3.7.3"), CanalNode: m("quay.io/calico/node:v3.7.4"),
CanalCNI: m("quay.io/calico/cni:v3.7.4"),
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"), CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
WeaveNode: m("weaveworks/weave-kube:2.5.2"), WeaveNode: m("weaveworks/weave-kube:2.5.2"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"), WeaveCNI: m("weaveworks/weave-npc:2.5.2"),

145
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go generated vendored
View File

@ -4,17 +4,17 @@ import "github.com/rancher/types/apis/management.cattle.io/v3"
func loadRancherDefaultK8sVersions() map[string]string { func loadRancherDefaultK8sVersions() map[string]string {
return map[string]string{ return map[string]string{
"2.3": "v1.14.3-rancher1-1", "2.3": "v1.15.0-rancher1-1",
// rancher will use default if its version is absent // rancher will use default if its version is absent
"default": "v1.14.3-rancher1-1", "default": "v1.15.0-rancher1-1",
} }
} }
func loadRKEDefaultK8sVersions() map[string]string { func loadRKEDefaultK8sVersions() map[string]string {
return map[string]string{ return map[string]string{
"0.2.3": "v1.14.3-rancher1-1", "0.3": "v1.15.0-rancher1-1",
// rke will use default if its version is absent // rke will use default if its version is absent
"default": "v1.14.3-rancher1-1", "default": "v1.15.0-rancher1-1",
} }
} }
@ -43,6 +43,10 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo {
MaxRancherVersion: "2.2", MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2", MaxRKEVersion: "0.2.2",
}, },
"v1.12": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.8.10-rancher1-1": { "v1.8.10-rancher1-1": {
DeprecateRKEVersion: "0.2.2", DeprecateRKEVersion: "0.2.2",
DeprecateRancherVersion: "2.2", DeprecateRancherVersion: "2.2",
@ -61,136 +65,3 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo {
}, },
} }
} }
func loadK8sVersionInfoPrev() map[string]v3.K8sVersionInfo {
return map[string]v3.K8sVersionInfo{
"v1.8.10-rancher1-1": {
MaxRancherVersion: "2.2",
DeprecateRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
DeprecateRKEVersion: "0.2.2",
},
"v1.8.11-rancher1": {
MaxRancherVersion: "2.2",
DeprecateRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
DeprecateRKEVersion: "0.2.2",
},
"v1.8.11-rancher2-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.9.5-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.9.7-rancher1": {
MaxRancherVersion: "2.2",
DeprecateRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
DeprecateRKEVersion: "0.2.2",
},
"v1.9.7-rancher2-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.9.7-rancher2-2": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.10.0-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.10.1-rancher1": {
MaxRancherVersion: "2.2",
DeprecateRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
DeprecateRKEVersion: "0.2.2",
},
"v1.10.1-rancher2-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.10.3-rancher2-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.10.5-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.10.5-rancher1-2": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.10.11-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.10.12-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.1-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.2-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.2-rancher1-2": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.3-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.5-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.8-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.6-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.9-rancher1-1": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.11.9-rancher1-2": {
MaxRancherVersion: "2.2",
MaxRKEVersion: "0.2.2",
},
"v1.12.0-rancher1-1": {},
"v1.12.1-rancher1-1": {},
"v1.12.3-rancher1-1": {},
"v1.12.4-rancher1-1": {},
"v1.12.5-rancher1-1": {},
"v1.12.5-rancher1-2": {},
"v1.12.6-rancher1-1": {},
"v1.12.6-rancher1-2": {},
"v1.12.7-rancher1-1": {},
"v1.12.7-rancher1-2": {},
"v1.12.7-rancher1-3": {},
"v1.12.9-rancher1-1": {},
"v1.13.1-rancher1-1": {},
"v1.13.1-rancher1-2": {},
"v1.13.4-rancher1-1": {},
"v1.13.4-rancher1-2": {},
"v1.13.5-rancher1-2": {},
"v1.13.5-rancher1-1": {},
"v1.13.5-rancher1-3": {},
"v1.13.7-rancher1-1": {},
"v1.14.1-rancher1-1": {},
"v1.14.1-rancher1-2": {},
"v1.14.3-rancher1-1": {},
"v1.15.0-rancher1-1": {},
}
}

38
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/calico.go generated vendored
View File

@ -1601,24 +1601,24 @@ spec:
# This container performs upgrade from host-local IPAM to calico-ipam. # This container performs upgrade from host-local IPAM to calico-ipam.
# It can be deleted if this is a fresh installation, or if you have already # It can be deleted if this is a fresh installation, or if you have already
# upgraded to use calico-ipam. # upgraded to use calico-ipam.
#- name: upgrade-ipam - name: upgrade-ipam
# image: calico/cni:v3.7.3 image: {{.CNIImage}}
# command: ["/opt/cni/bin/calico-ipam", "-upgrade"] command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
# env: env:
# - name: KUBERNETES_NODE_NAME - name: KUBERNETES_NODE_NAME
# valueFrom: valueFrom:
# fieldRef: fieldRef:
# fieldPath: spec.nodeName fieldPath: spec.nodeName
# - name: CALICO_NETWORKING_BACKEND - name: CALICO_NETWORKING_BACKEND
# valueFrom: valueFrom:
# configMapKeyRef: configMapKeyRef:
# name: calico-config name: calico-config
# key: calico_backend key: calico_backend
# volumeMounts: volumeMounts:
# - mountPath: /var/lib/cni/networks - mountPath: /var/lib/cni/networks
# name: host-local-net-dir name: host-local-net-dir
# - mountPath: /host/opt/cni/bin - mountPath: /host/opt/cni/bin
# name: cni-bin-dir name: cni-bin-dir
# This container installs the CNI binaries # This container installs the CNI binaries
# and CNI network config file on each node. # and CNI network config file on each node.
- name: install-cni - name: install-cni
@ -1815,7 +1815,7 @@ spec:
{{end}} {{end}}
containers: containers:
- name: calico-kube-controllers - name: calico-kube-controllers
image: calico/kube-controllers:v3.7.3 image: {{.ControllersImage}}
env: env:
# Choose which controllers to run. # Choose which controllers to run.
- name: ENABLED_CONTROLLERS - name: ENABLED_CONTROLLERS

9
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/flannel.go generated vendored
View File

@ -344,13 +344,13 @@ metadata:
namespace: kube-system namespace: kube-system
labels: labels:
tier: node tier: node
app: flannel k8s-app: flannel
spec: spec:
template: template:
metadata: metadata:
labels: labels:
tier: node tier: node
app: flannel k8s-app: flannel
spec: spec:
affinity: affinity:
nodeAffinity: nodeAffinity:
@ -364,7 +364,6 @@ spec:
hostNetwork: true hostNetwork: true
tolerations: tolerations:
- operator: Exists - operator: Exists
effect: NoSchedule
{{- if eq .RBACConfig "rbac"}} {{- if eq .RBACConfig "rbac"}}
serviceAccountName: flannel serviceAccountName: flannel
{{end}} {{end}}
@ -436,4 +435,8 @@ spec:
- name: host-cni-bin - name: host-cni-bin
hostPath: hostPath:
path: /opt/cni/bin path: /opt/cni/bin
updateStrategy:
rollingUpdate:
maxUnavailable: 20%
type: RollingUpdate
` `