Merge pull request #2242 from PennyScissors/master

Vendor kdm v1.17.12, v1.18.9, v1.19.2 + 1.16.15 ingress
2025-09-16 15:10:12 +00:00 · 2020-09-18 13:08:02 -07:00
parent 998c4fd72d 45cf76c84f
commit 44805a9381
2 changed files with 150 additions and 5 deletions
--- a/data/bindata.go
+++ b/data/bindata.go
--- a/data/data.json
+++ b/data/data.json
@@ -4740,6 +4740,39 @@
   "metricsServer": "rancher/metrics-server:v0.3.4",
   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
  },
+  "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",
+   "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.7.1",
+   "coredns": "rancher/coredns-coredns:1.6.2",
+   "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1",
+   "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
+   "kubernetes": "rancher/hyperkube:v1.16.15-rancher1",
+   "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.4",
+   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
+  },
  "v1.16.2-rancher1-1": {
   "etcd": "rancher/coreos-etcd:v3.3.15-rancher1",
   "alpine": "rancher/rke-tools:v0.1.50",
@@ -5151,6 +5184,39 @@
   "metricsServer": "rancher/metrics-server:v0.3.6",
   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
  },
+  "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",
+   "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.7.1",
+   "coredns": "rancher/coredns-coredns:1.6.5",
+   "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1",
+   "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
+   "kubernetes": "rancher/hyperkube:v1.17.12-rancher1",
+   "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.6",
+   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
+  },
  "v1.17.2-rancher1-1": {
   "etcd": "rancher/coreos-etcd:v3.4.3-rancher1",
   "alpine": "rancher/rke-tools:v0.1.52",
@@ -5640,6 +5706,39 @@
   "metricsServer": "rancher/metrics-server:v0.3.6",
   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.4"
  },
+  "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",
+   "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",
+   "kubednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1",
+   "coredns": "rancher/coredns-coredns:1.6.9",
+   "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1",
+   "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
+   "kubernetes": "rancher/hyperkube:v1.18.9-rancher1",
+   "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.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",
@@ -5703,7 +5802,41 @@
   "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.32.0-rancher1",
+   "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",
+   "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.2-rancher1",
+   "flannel": "rancher/coreos-flannel:v0.13.0-rancher1-rc1",
+   "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-rc1",
+   "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"
@@ -6007,6 +6140,10 @@
   "minRKEVersion": "1.1.2-rc0",
   "minRancherVersion": "2.4.4-rc0"
  },
+  "v1.16.15-rancher1-2": {
+   "minRKEVersion": "1.1.2-rc0",
+   "minRancherVersion": "2.4.4-rc0"
+  },
  "v1.16.8-rancher1-1": {
   "minRKEVersion": "1.0.0",
   "minRancherVersion": "2.3.3"
@@ -6023,6 +6160,10 @@
   "minRKEVersion": "1.1.2-rc0",
   "minRancherVersion": "2.4.4-rc0"
  },
+  "v1.17.12-rancher1-1": {
+   "minRKEVersion": "1.1.2-rc0",
+   "minRancherVersion": "2.4.4-rc0"
+  },
  "v1.17.4-rancher1-1": {
   "minRKEVersion": "1.0.0",
   "minRancherVersion": "2.3.3"
@@ -6071,6 +6212,10 @@
   "minRKEVersion": "1.1.3-rc0",
   "minRancherVersion": "2.4.5-rc0"
  },
+  "v1.18.9-rancher1-1": {
+   "minRKEVersion": "1.1.3-rc0",
+   "minRancherVersion": "2.4.5-rc0"
+  },
  "v1.8": {
   "maxRKEVersion": "0.2.2",
   "maxRancherVersion": "2.2"
@@ -6109,7 +6254,7 @@
 },
 "RKEDefaultK8sVersions": {
  "0.3": "v1.16.3-rancher1-1",
-  "default": "v1.19.1-rancher1-1"
+  "default": "v1.19.2-rancher1-1"
 },
 "K8sVersionDockerInfo": {
  "1.10": [
@@ -6546,7 +6691,7 @@
   {
    "maxChannelServerVersion": "v2.5.99",
    "minChannelServerVersion": "v2.5.0-rc1",
-    "version": "v1.18.4-alpha19+rke2"
+    "version": "v1.18.8-beta19+rke2"
   }
  ]
 }