Merge pull request #2251 from superseb/update_kdm_20202509

vendor kdm v1.15.12-rancher2-6 / rke-tools v0.1.65

Merge pull request #2251 from superseb/update_kdm_20202509
vendor kdm v1.15.12-rancher2-6 / rke-tools v0.1.65
33c69c01 · Sebastiaan van Steenis · GitHub · 2fb1a281 · 1fbea609 · 33c69c01
Unverified Commit 33c69c01 authored 4 years ago by Sebastiaan van Steenis Committed by GitHub 4 years ago
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 59 additions and 86 deletions
+59 -86
--- a/data/bindata.go
+++ b/data/bindata.go
--- a/data/data.json
+++ b/data/data.json
@@ -4215,6 +4215,39 @@
   "metricsServer": "rancher/metrics-server:v0.3.3",
   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
  },
+  "v1.15.12-rancher2-6": {
+   "etcd": "rancher/coreos-etcd:v3.3.10-rancher1",
+   "alpine": "rancher/rke-tools:v0.1.65",
+   "nginxProxy": "rancher/rke-tools:v0.1.65",
+   "certDownloader": "rancher/rke-tools:v0.1.65",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.65",
+   "kubedns": "rancher/k8s-dns-kube-dns:1.15.0",
+   "dnsmasq": "rancher/k8s-dns-dnsmasq-nanny:1.15.0",
+   "kubednsSidecar": "rancher/k8s-dns-sidecar:1.15.0",
+   "kubednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.3.0",
+   "coredns": "rancher/coredns-coredns:1.3.1",
+   "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.3.0",
+   "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
+   "kubernetes": "rancher/hyperkube:v1.15.12-rancher2",
+   "flannel": "rancher/coreos-flannel:v0.12.0",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
+   "calicoNode": "rancher/calico-node:v3.13.4",
+   "calicoCni": "rancher/calico-cni:v3.13.4",
+   "calicoControllers": "rancher/calico-kube-controllers:v3.13.4",
+   "calicoCtl": "rancher/calico-ctl:v3.13.4",
+   "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
+   "canalNode": "rancher/calico-node:v3.13.4",
+   "canalCni": "rancher/calico-cni:v3.13.4",
+   "canalFlannel": "rancher/coreos-flannel:v0.12.0",
+   "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
+   "weaveNode": "weaveworks/weave-kube:2.6.4",
+   "weaveCni": "weaveworks/weave-npc:2.6.4",
+   "podInfraContainer": "rancher/pause:3.1",
+   "ingress": "rancher/nginx-ingress-controller:nginx-0.35.0-rancher1",
+   "ingressBackend": "rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1",
+   "metricsServer": "rancher/metrics-server:v0.3.3",
+   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
+  },
  "v1.15.2-rancher1-1": {
   "etcd": "rancher/coreos-etcd:v3.3.10-rancher1",
   "alpine": "rancher/rke-tools:v0.1.40",
@@ -4742,10 +4775,10 @@
  },
  "v1.16.15-rancher1-2": {
   "etcd": "rancher/coreos-etcd:v3.3.15-rancher1",
-   "alpine": "rancher/rke-tools:v0.1.64",
-   "nginxProxy": "rancher/rke-tools:v0.1.64",
-   "certDownloader": "rancher/rke-tools:v0.1.64",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.64",
+   "alpine": "rancher/rke-tools:v0.1.65",
+   "nginxProxy": "rancher/rke-tools:v0.1.65",
+   "certDownloader": "rancher/rke-tools:v0.1.65",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.65",
   "kubedns": "rancher/k8s-dns-kube-dns:1.15.0",
   "dnsmasq": "rancher/k8s-dns-dnsmasq-nanny:1.15.0",
   "kubednsSidecar": "rancher/k8s-dns-sidecar:1.15.0",
@@ -5186,10 +5219,10 @@
  },
  "v1.17.12-rancher1-1": {
   "etcd": "rancher/coreos-etcd:v3.4.3-rancher1",
-   "alpine": "rancher/rke-tools:v0.1.64",
-   "nginxProxy": "rancher/rke-tools:v0.1.64",
-   "certDownloader": "rancher/rke-tools:v0.1.64",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.64",
+   "alpine": "rancher/rke-tools:v0.1.65",
+   "nginxProxy": "rancher/rke-tools:v0.1.65",
+   "certDownloader": "rancher/rke-tools:v0.1.65",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.65",
   "kubedns": "rancher/k8s-dns-kube-dns:1.15.0",
   "dnsmasq": "rancher/k8s-dns-dnsmasq-nanny:1.15.0",
   "kubednsSidecar": "rancher/k8s-dns-sidecar:1.15.0",
@@ -5708,10 +5741,10 @@
  },
  "v1.18.9-rancher1-1": {
   "etcd": "rancher/coreos-etcd:v3.4.3-rancher1",
-   "alpine": "rancher/rke-tools:v0.1.64",
-   "nginxProxy": "rancher/rke-tools:v0.1.64",
-   "certDownloader": "rancher/rke-tools:v0.1.64",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.64",
+   "alpine": "rancher/rke-tools:v0.1.65",
+   "nginxProxy": "rancher/rke-tools:v0.1.65",
+   "certDownloader": "rancher/rke-tools:v0.1.65",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.65",
   "kubedns": "rancher/k8s-dns-kube-dns:1.15.2",
   "dnsmasq": "rancher/k8s-dns-dnsmasq-nanny:1.15.2",
   "kubednsSidecar": "rancher/k8s-dns-sidecar:1.15.2",
@@ -5739,80 +5772,12 @@
   "metricsServer": "rancher/metrics-server:v0.3.6",
   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
  },
-  "v1.19.0-rancher1-1": {
-   "etcd": "rancher/coreos-etcd:v3.4.13-rancher1",
-   "alpine": "rancher/rke-tools:v0.1.64",
-   "nginxProxy": "rancher/rke-tools:v0.1.64",
-   "certDownloader": "rancher/rke-tools:v0.1.64",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.64",
-   "kubedns": "rancher/k8s-dns-kube-dns:1.15.10",
-   "dnsmasq": "rancher/k8s-dns-dnsmasq-nanny:1.15.10",
-   "kubednsSidecar": "rancher/k8s-dns-sidecar:1.15.10",
-   "kubednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.8.1",
-   "coredns": "rancher/coredns-coredns:1.7.0",
-   "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.8.1",
-   "nodelocal": "rancher/k8s-dns-node-cache:1.15.13",
-   "kubernetes": "rancher/hyperkube:v1.19.0-rancher1",
-   "flannel": "rancher/coreos-flannel:v0.13.0-rancher1",
-   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
-   "calicoNode": "rancher/calico-node:v3.16.0",
-   "calicoCni": "rancher/calico-cni:v3.16.0",
-   "calicoControllers": "rancher/calico-kube-controllers:v3.16.0",
-   "calicoCtl": "rancher/calico-ctl:v3.16.0",
-   "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.16.0",
-   "canalNode": "rancher/calico-node:v3.16.0",
-   "canalCni": "rancher/calico-cni:v3.16.0",
-   "canalControllers": "rancher/calico-kube-controllers:v3.16.0",
-   "canalFlannel": "rancher/coreos-flannel:v0.13.0-rancher1",
-   "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.16.0",
-   "weaveNode": "weaveworks/weave-kube:2.6.5",
-   "weaveCni": "weaveworks/weave-npc:2.6.5",
-   "podInfraContainer": "rancher/pause:3.2",
-   "ingress": "rancher/nginx-ingress-controller:nginx-0.32.0-rancher1",
-   "ingressBackend": "rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1",
-   "metricsServer": "rancher/metrics-server:v0.3.6",
-   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
-  },
-  "v1.19.1-rancher1-1": {
-   "etcd": "rancher/coreos-etcd:v3.4.13-rancher1",
-   "alpine": "rancher/rke-tools:v0.1.64",
-   "nginxProxy": "rancher/rke-tools:v0.1.64",
-   "certDownloader": "rancher/rke-tools:v0.1.64",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.64",
-   "kubedns": "rancher/k8s-dns-kube-dns:1.15.10",
-   "dnsmasq": "rancher/k8s-dns-dnsmasq-nanny:1.15.10",
-   "kubednsSidecar": "rancher/k8s-dns-sidecar:1.15.10",
-   "kubednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.8.1",
-   "coredns": "rancher/coredns-coredns:1.7.0",
-   "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.8.1",
-   "nodelocal": "rancher/k8s-dns-node-cache:1.15.13",
-   "kubernetes": "rancher/hyperkube:v1.19.1-rancher1",
-   "flannel": "rancher/coreos-flannel:v0.13.0-rancher1",
-   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
-   "calicoNode": "rancher/calico-node:v3.16.1",
-   "calicoCni": "rancher/calico-cni:v3.16.1",
-   "calicoControllers": "rancher/calico-kube-controllers:v3.16.1",
-   "calicoCtl": "rancher/calico-ctl:v3.16.1",
-   "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.16.1",
-   "canalNode": "rancher/calico-node:v3.16.1",
-   "canalCni": "rancher/calico-cni:v3.16.1",
-   "canalControllers": "rancher/calico-kube-controllers:v3.16.1",
-   "canalFlannel": "rancher/coreos-flannel:v0.13.0-rancher1",
-   "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.16.1",
-   "weaveNode": "weaveworks/weave-kube:2.7.0",
-   "weaveCni": "weaveworks/weave-npc:2.7.0",
-   "podInfraContainer": "rancher/pause:3.2",
-   "ingress": "rancher/nginx-ingress-controller:nginx-0.35.0-rancher1",
-   "ingressBackend": "rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1",
-   "metricsServer": "rancher/metrics-server:v0.3.6",
-   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
-  },
  "v1.19.2-rancher1-1": {
   "etcd": "rancher/coreos-etcd:v3.4.13-rancher1",
-   "alpine": "rancher/rke-tools:v0.1.64",
-   "nginxProxy": "rancher/rke-tools:v0.1.64",
-   "certDownloader": "rancher/rke-tools:v0.1.64",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.64",
+   "alpine": "rancher/rke-tools:v0.1.65",
+   "nginxProxy": "rancher/rke-tools:v0.1.65",
+   "certDownloader": "rancher/rke-tools:v0.1.65",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.65",
   "kubedns": "rancher/k8s-dns-kube-dns:1.15.10",
   "dnsmasq": "rancher/k8s-dns-dnsmasq-nanny:1.15.10",
   "kubednsSidecar": "rancher/k8s-dns-sidecar:1.15.10",
@@ -6112,6 +6077,10 @@
   "minRKEVersion": "1.1.5-rc0",
   "minRancherVersion": "2.4.6-rc0"
  },
+  "v1.15.12-rancher2-6": {
+   "minRKEVersion": "1.1.5-rc0",
+   "minRancherVersion": "2.4.6-rc0"
+  },
  "v1.15.5-rancher1-1": {
   "maxRKEVersion": "0.2.8",
   "maxRancherVersion": "2.2.9"
@@ -6216,6 +6185,10 @@
   "minRKEVersion": "1.1.3-rc0",
   "minRancherVersion": "2.4.5-rc0"
  },
+  "v1.19": {
+   "minRKEVersion": "1.2.0-rc0",
+   "minRancherVersion": "2.5.0-rc0"
+  },
  "v1.8": {
   "maxRKEVersion": "0.2.2",
   "maxRancherVersion": "2.2"