diff --git a/vendor.conf b/vendor.conf index 68f16942..96f6e71d 100644 --- a/vendor.conf +++ b/vendor.conf @@ -30,4 +30,4 @@ github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ad github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1 github.com/rancher/types 45caae4c520880a0164cd220ef2baf9ae96047b1 -github.com/rancher/kontainer-driver-metadata b626495674afbb1e2ba5fd024020014ad970e3d5 +github.com/rancher/kontainer-driver-metadata 821544f898e7bcbc0a475d2f0afccc6c272f691c diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go index 6b8622b5..bfcfda6f 100644 --- a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go +++ b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go @@ -773,6 +773,35 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { CoreDNS: m("coredns/coredns:1.2.2"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, + // Enabled in Rancher v2.2.7 + "v1.12.10-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.12.10-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.40"), + NginxProxy: m("rancher/rke-tools:v0.1.40"), + CertDownloader: m("rancher/rke-tools:v0.1.40"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.40"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.14.13"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.14.13"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.14.13"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"), + FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), + CalicoNode: m("quay.io/calico/node:v3.1.3"), + CalicoCNI: m("quay.io/calico/cni:v3.1.3"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.3"), + CanalCNI: m("quay.io/calico/cni:v3.1.3"), + 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:0.21.0-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), + MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), + CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), + }, "v1.13.1-rancher1-2": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"), @@ -918,10 +947,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { "v1.13.8-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), Kubernetes: m("rancher/hyperkube:v1.13.8-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.39"), - NginxProxy: m("rancher/rke-tools:v0.1.39"), - CertDownloader: m("rancher/rke-tools:v0.1.39"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.39"), + Alpine: m("rancher/rke-tools:v0.1.40"), + NginxProxy: m("rancher/rke-tools:v0.1.40"), + CertDownloader: m("rancher/rke-tools:v0.1.40"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.40"), 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"), @@ -1032,10 +1061,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { "v1.14.4-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), Kubernetes: m("rancher/hyperkube:v1.14.4-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.39"), - NginxProxy: m("rancher/rke-tools:v0.1.39"), - CertDownloader: m("rancher/rke-tools:v0.1.39"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.39"), + Alpine: m("rancher/rke-tools:v0.1.40"), + NginxProxy: m("rancher/rke-tools:v0.1.40"), + CertDownloader: m("rancher/rke-tools:v0.1.40"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.40"), 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"), @@ -1090,10 +1119,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { "v1.15.0-rancher1-2": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), Kubernetes: m("rancher/hyperkube:v1.15.0-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.39"), - NginxProxy: m("rancher/rke-tools:v0.1.39"), - CertDownloader: m("rancher/rke-tools:v0.1.39"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.39"), + Alpine: m("rancher/rke-tools:v0.1.40"), + NginxProxy: m("rancher/rke-tools:v0.1.40"), + CertDownloader: m("rancher/rke-tools:v0.1.40"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.40"), 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"), diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_windows_defaults.go b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_windows_defaults.go index 683ab739..9054f9d3 100644 --- a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_windows_defaults.go +++ b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_windows_defaults.go @@ -292,6 +292,12 @@ func loadK8sVersionWindowsSystemimages() map[string]v3.WindowsSystemImages { FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.12.10-rancher1-1": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.12.10-nanoserver-1803"), + FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, "v1.13.1-rancher1-2": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"),