mirror of
https://github.com/rancher/rke.git
synced 2025-09-03 07:54:14 +00:00
Vendor updates to latest kdm
This commit is contained in:
Prachi Damle
committed by
Alena Prokharchyk
Alena Prokharchyk
parent
5cf3f1c161
commit
101192c1c7
4
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_docker_info.go
generated
vendored
4
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_docker_info.go
generated
vendored
@@ -10,5 +10,7 @@ func loadK8sVersionDockerInfo() map[string][]string {
|
||||
"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", "19.03.x"},
|
||||
"1.14": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"},
|
||||
"1.15": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"},
|
||||
"1.16": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"}}
|
||||
"1.16": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"},
|
||||
"1.17": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"},
|
||||
}
|
||||
}
|
||||
|
||||
123
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
123
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
@@ -1353,6 +1353,35 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.3
|
||||
"v1.14.9-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.14.9-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.51"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.51"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.51"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CanalNode: m("quay.io/calico/node:v3.4.0"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.4.0"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
},
|
||||
// Experimental in Rancher v2.2.5
|
||||
"v1.15.0-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
@@ -1595,6 +1624,37 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.3
|
||||
"v1.15.6-rancher1-2": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.15.6-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.51"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.51"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.51"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.7.4"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.7.4"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CalicoControllers: m("quay.io/calico/kube-controllers:v3.7.4"),
|
||||
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"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.3"),
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// Experimental in Rancher v2.3.0
|
||||
"v1.16.1-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.15-rancher1"),
|
||||
@@ -1691,6 +1751,69 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// Enabled in Rancher v2.3.3
|
||||
"v1.16.3-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.15-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.16.3-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.51"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.51"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.51"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.8.1"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.8.1"),
|
||||
CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.1"),
|
||||
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
|
||||
CanalNode: m("quay.io/calico/node:v3.8.1"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.8.1"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
|
||||
CanalFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.4"),
|
||||
CoreDNS: m("coredns/coredns:1.6.2"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
"v1.17.0-beta.2-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.4.3-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.17.0-beta.2-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.51"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.51"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.51"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.8.1"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.8.1"),
|
||||
CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.1"),
|
||||
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
|
||||
CanalNode: m("quay.io/calico/node:v3.8.1"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.8.1"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
|
||||
CanalFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
|
||||
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.4"),
|
||||
CoreDNS: m("coredns/coredns:1.6.2"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
|
||||
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
|
||||
},
|
||||
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
|
||||
// without all clusters being restarted
|
||||
"v1.11.9-rancher1-3": {
|
||||
|
||||
39
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_service_options.go
generated
vendored
39
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_service_options.go
generated
vendored
@@ -13,6 +13,22 @@ const (
|
||||
|
||||
func loadK8sVersionServiceOptions() map[string]v3.KubernetesServicesOptions {
|
||||
return map[string]v3.KubernetesServicesOptions{
|
||||
"v1.17.0-beta.2-rancher1-1": {
|
||||
Etcd: getETCDOptions(),
|
||||
KubeAPI: getKubeAPIOptions116(),
|
||||
Kubelet: getKubeletOptions116(),
|
||||
KubeController: getKubeControllerOptions(),
|
||||
Kubeproxy: getKubeProxyOptions(),
|
||||
Scheduler: getSchedulerOptions(),
|
||||
},
|
||||
"v1.16.3-rancher1-1": {
|
||||
Etcd: getETCDOptions(),
|
||||
KubeAPI: getKubeAPIOptions116(),
|
||||
Kubelet: getKubeletOptions116(),
|
||||
KubeController: getKubeControllerOptions(),
|
||||
Kubeproxy: getKubeProxyOptions(),
|
||||
Scheduler: getSchedulerOptions(),
|
||||
},
|
||||
"v1.16": {
|
||||
KubeAPI: getKubeAPIOptions116(),
|
||||
Kubelet: getKubeletOptions116(),
|
||||
@@ -20,6 +36,14 @@ func loadK8sVersionServiceOptions() map[string]v3.KubernetesServicesOptions {
|
||||
Kubeproxy: getKubeProxyOptions(),
|
||||
Scheduler: getSchedulerOptions(),
|
||||
},
|
||||
"v1.15.6-rancher1-2": {
|
||||
Etcd: getETCDOptions(),
|
||||
KubeAPI: getKubeAPIOptions115(),
|
||||
Kubelet: getKubeletOptions115(),
|
||||
KubeController: getKubeControllerOptions(),
|
||||
Kubeproxy: getKubeProxyOptions(),
|
||||
Scheduler: getSchedulerOptions(),
|
||||
},
|
||||
"v1.15": {
|
||||
KubeAPI: getKubeAPIOptions115(),
|
||||
Kubelet: getKubeletOptions115(),
|
||||
@@ -27,6 +51,14 @@ func loadK8sVersionServiceOptions() map[string]v3.KubernetesServicesOptions {
|
||||
Kubeproxy: getKubeProxyOptions(),
|
||||
Scheduler: getSchedulerOptions(),
|
||||
},
|
||||
"v1.14.9-rancher1-1": {
|
||||
Etcd: getETCDOptions(),
|
||||
KubeAPI: getKubeAPIOptions114(),
|
||||
Kubelet: getKubeletOptions(),
|
||||
KubeController: getKubeControllerOptions(),
|
||||
Kubeproxy: getKubeProxyOptions(),
|
||||
Scheduler: getSchedulerOptions(),
|
||||
},
|
||||
"v1.14": {
|
||||
KubeAPI: getKubeAPIOptions114(),
|
||||
Kubelet: getKubeletOptions(),
|
||||
@@ -192,3 +224,10 @@ func getSchedulerOptions() map[string]string {
|
||||
"profiling": "false",
|
||||
}
|
||||
}
|
||||
|
||||
func getETCDOptions() map[string]string {
|
||||
return map[string]string{
|
||||
"client-cert-auth": "true",
|
||||
"peer-client-cert-auth": "true",
|
||||
}
|
||||
}
|
||||
|
||||
4
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go
generated
vendored
4
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go
generated
vendored
@@ -19,9 +19,9 @@ func loadRancherDefaultK8sVersions() map[string]string {
|
||||
|
||||
func loadRKEDefaultK8sVersions() map[string]string {
|
||||
return map[string]string{
|
||||
"0.3": "v1.16.2-rancher2-1",
|
||||
"0.3": "v1.16.3-rancher1-1",
|
||||
// rke will use default if its version is absent
|
||||
"default": "v1.16.2-rancher2-1",
|
||||
"default": "v1.16.3-rancher1-1",
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user