Merge pull request #2068 from aiyengar2/pull-kdm-commits

Pull in KDM changes

data/data.json

@@ -3403,6 +3403,39 @@
    "metricsServer": "rancher/metrics-server:v0.3.3",
    "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
   },
+  "v1.15.12-rancher1-2": {
+   "etcd": "rancher/coreos-etcd:v3.3.10-rancher1",
+   "alpine": "rancher/rke-tools:v0.1.56",
+   "nginxProxy": "rancher/rke-tools:v0.1.56",
+   "certDownloader": "rancher/rke-tools:v0.1.56",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.56",
+   "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-rancher1",
+   "flannel": "rancher/coreos-flannel:v0.11.0-rancher1",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher5",
+   "calicoNode": "rancher/calico-node:v3.13.0",
+   "calicoCni": "rancher/calico-cni:v3.13.0",
+   "calicoControllers": "rancher/calico-kube-controllers:v3.13.0",
+   "calicoCtl": "rancher/calico-ctl:v2.0.0",
+   "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0",
+   "canalNode": "rancher/calico-node:v3.13.0",
+   "canalCni": "rancher/calico-cni:v3.13.0",
+   "canalFlannel": "rancher/coreos-flannel:v0.11.0",
+   "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0",
+   "weaveNode": "weaveworks/weave-kube:2.5.2",
+   "weaveCni": "weaveworks/weave-npc:2.5.2",
+   "podInfraContainer": "rancher/pause:3.1",
+   "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.3",
+   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
+  },
   "v1.15.2-rancher1-1": {
    "etcd": "rancher/coreos-etcd:v3.3.10-rancher1",
    "alpine": "rancher/rke-tools:v0.1.40",
@@ -3730,6 +3763,39 @@
    "metricsServer": "rancher/metrics-server:v0.3.4",
    "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
   },
+  "v1.16.10-rancher1-1": {
+   "etcd": "rancher/coreos-etcd:v3.3.15-rancher1",
+   "alpine": "rancher/rke-tools:v0.1.56",
+   "nginxProxy": "rancher/rke-tools:v0.1.56",
+   "certDownloader": "rancher/rke-tools:v0.1.56",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.56",
+   "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.10-rancher1",
+   "flannel": "rancher/coreos-flannel:v0.11.0-rancher1",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher5",
+   "calicoNode": "rancher/calico-node:v3.13.0",
+   "calicoCni": "rancher/calico-cni:v3.13.0",
+   "calicoControllers": "rancher/calico-kube-controllers:v3.13.0",
+   "calicoCtl": "rancher/calico-ctl:v2.0.0",
+   "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0",
+   "canalNode": "rancher/calico-node:v3.13.0",
+   "canalCni": "rancher/calico-cni:v3.13.0",
+   "canalFlannel": "rancher/coreos-flannel:v0.11.0",
+   "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0",
+   "weaveNode": "weaveworks/weave-kube:2.5.2",
+   "weaveCni": "weaveworks/weave-npc:2.5.2",
+   "podInfraContainer": "rancher/pause:3.1",
+   "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.4",
+   "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
+  },
   "v1.16.2-rancher1-1": {
    "etcd": "rancher/coreos-etcd:v3.3.15-rancher1",
    "alpine": "rancher/rke-tools:v0.1.50",
@@ -4300,6 +4366,39 @@
    "metricsServer": "rancher/metrics-server:v0.3.6",
    "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
   },
+  "v1.17.6-rancher1-1": {
+   "etcd": "rancher/coreos-etcd:v3.4.3-rancher1",
+   "alpine": "rancher/rke-tools:v0.1.56",
+   "nginxProxy": "rancher/rke-tools:v0.1.56",
+   "certDownloader": "rancher/rke-tools:v0.1.56",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.56",
+   "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.6-rancher1",
+   "flannel": "rancher/coreos-flannel:v0.11.0-rancher1",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher5",
+   "calicoNode": "rancher/calico-node:v3.13.0",
+   "calicoCni": "rancher/calico-cni:v3.13.0",
+   "calicoControllers": "rancher/calico-kube-controllers:v3.13.0",
+   "calicoCtl": "rancher/calico-ctl:v2.0.0",
+   "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0",
+   "canalNode": "rancher/calico-node:v3.13.0",
+   "canalCni": "rancher/calico-cni:v3.13.0",
+   "canalFlannel": "rancher/coreos-flannel:v0.11.0",
+   "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0",
+   "weaveNode": "weaveworks/weave-kube:2.5.2",
+   "weaveCni": "weaveworks/weave-npc:2.5.2",
+   "podInfraContainer": "rancher/pause:3.1",
+   "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.3"
+  },
   "v1.18.3-rancher1-1": {
    "etcd": "rancher/coreos-etcd:v3.4.3-rancher1",
    "alpine": "rancher/rke-tools:v0.1.56",
@@ -4328,7 +4427,7 @@
    "weaveNode": "weaveworks/weave-kube:2.6.2",
    "weaveCni": "weaveworks/weave-npc:2.6.2",
    "podInfraContainer": "rancher/pause:3.1",
-   "ingress": "rancher/nginx-ingress-controller:nginx-0.25.1-rancher1",
+   "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.3"
@@ -4480,7 +4579,12 @@
    "\u003e=1.14.0-rancher0 \u003c=1.14.6-rancher1-1": "nginxingress-v1.8",
    "\u003e=1.14.6-rancher2 \u003c1.15.0-rancher0": "nginxingress-v1.15",
    "\u003e=1.15.0-rancher0 \u003c=1.15.3-rancher1-1": "nginxingress-v1.8",
-   "\u003e=1.15.3-rancher2": "nginxingress-v1.15",
+   "\u003e=1.15.12-rancher1-2 \u003c1.16.1-rancher1-1": "nginxingress-v1.15.12",
+   "\u003e=1.15.3-rancher2 \u003c1.15.12-rancher1-2": "nginxingress-v1.15",
+   "\u003e=1.16.1-rancher1-1 \u003c1.16.10-rancher1-1": "nginxingress-v1.15",
+   "\u003e=1.16.10-rancher1-1 \u003c1.17.0-rancher1-1": "nginxingress-v1.15.12",
+   "\u003e=1.17.0-rancher1-1 \u003c1.17.6-rancher1-1": "nginxingress-v1.15",
+   "\u003e=1.17.6-rancher1-1": "nginxingress-v1.15.12",
    "\u003e=1.8.0-rancher0 \u003c1.13.10-rancher1-3": "nginxingress-v1.8"
   },
   "nodelocal": {
@@ -4560,10 +4664,18 @@
    "minRKEVersion": "1.0.7",
    "minRancherVersion": "2.3.7"
   },
+  "v1.15.12-rancher1-2": {
+   "minRKEVersion": "1.0.7",
+   "minRancherVersion": "2.3.7"
+  },
   "v1.15.5-rancher1-1": {
    "maxRKEVersion": "0.2.8",
    "maxRancherVersion": "2.2.9"
   },
+  "v1.16.10-rancher1-1": {
+   "minRKEVersion": "1.0.7",
+   "minRancherVersion": "2.3.7"
+  },
   "v1.16.8-rancher1-1": {
    "minRKEVersion": "1.0.0",
    "minRancherVersion": "2.3.3"
@@ -4588,6 +4700,10 @@
    "minRKEVersion": "1.0.7",
    "minRancherVersion": "2.3.7-rc0"
   },
+  "v1.17.6-rancher1-1": {
+   "minRKEVersion": "1.0.7",
+   "minRancherVersion": "2.3.7"
+  },
   "v1.18.3-rancher1-1": {
    "minRKEVersion": "1.1.1-rc99",
    "minRancherVersion": "2.4.4-rc0"
@@ -4994,9 +5110,14 @@
  "k3s": {
   "releases": [
    {
-    "maxChannelServerVersion": "v2.4.99",
+    "maxChannelServerVersion": "v2.4.2",
     "minChannelServerVersion": "v2.4.0-rc1",
     "version": "v1.17.4+k3s1"
+   },
+   {
+    "maxChannelServerVersion": "v2.4.99",
+    "minChannelServerVersion": "v2.4.3-rc1",
+    "version": "v1.17.5+k3s1"
    }
   ]
  }