1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-18 14:57:03 +00:00

Update kdm to latest dev-v2.5

This commit is contained in:
Daishan 2020-05-27 21:36:50 -07:00 committed by Denise
parent 4295b887b3
commit 33480c6229
2 changed files with 51 additions and 51 deletions

File diff suppressed because one or more lines are too long

View File

@ -3403,7 +3403,7 @@
"metricsServer": "rancher/metrics-server:v0.3.3", "metricsServer": "rancher/metrics-server:v0.3.3",
"windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3" "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
}, },
"v1.15.12-rancher1-2": { "v1.15.12-rancher2-2": {
"etcd": "rancher/coreos-etcd:v3.3.10-rancher1", "etcd": "rancher/coreos-etcd:v3.3.10-rancher1",
"alpine": "rancher/rke-tools:v0.1.56", "alpine": "rancher/rke-tools:v0.1.56",
"nginxProxy": "rancher/rke-tools:v0.1.56", "nginxProxy": "rancher/rke-tools:v0.1.56",
@ -3416,18 +3416,18 @@
"coredns": "rancher/coredns-coredns:1.3.1", "coredns": "rancher/coredns-coredns:1.3.1",
"corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.3.0", "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.3.0",
"nodelocal": "rancher/k8s-dns-node-cache:1.15.7", "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
"kubernetes": "rancher/hyperkube:v1.15.12-rancher1", "kubernetes": "rancher/hyperkube:v1.15.12-rancher2",
"flannel": "rancher/coreos-flannel:v0.11.0-rancher1", "flannel": "rancher/coreos-flannel:v0.11.0-rancher1",
"flannelCni": "rancher/flannel-cni:v0.3.0-rancher5", "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
"calicoNode": "rancher/calico-node:v3.13.0", "calicoNode": "rancher/calico-node:v3.13.4",
"calicoCni": "rancher/calico-cni:v3.13.0", "calicoCni": "rancher/calico-cni:v3.13.4",
"calicoControllers": "rancher/calico-kube-controllers:v3.13.0", "calicoControllers": "rancher/calico-kube-controllers:v3.13.4",
"calicoCtl": "rancher/calico-ctl:v2.0.0", "calicoCtl": "rancher/calico-ctl:v3.13.4",
"calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"canalNode": "rancher/calico-node:v3.13.0", "canalNode": "rancher/calico-node:v3.13.4",
"canalCni": "rancher/calico-cni:v3.13.0", "canalCni": "rancher/calico-cni:v3.13.4",
"canalFlannel": "rancher/coreos-flannel:v0.11.0", "canalFlannel": "rancher/coreos-flannel:v0.11.0",
"canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"weaveNode": "weaveworks/weave-kube:2.5.2", "weaveNode": "weaveworks/weave-kube:2.5.2",
"weaveCni": "weaveworks/weave-npc:2.5.2", "weaveCni": "weaveworks/weave-npc:2.5.2",
"podInfraContainer": "rancher/pause:3.1", "podInfraContainer": "rancher/pause:3.1",
@ -3763,7 +3763,7 @@
"metricsServer": "rancher/metrics-server:v0.3.4", "metricsServer": "rancher/metrics-server:v0.3.4",
"windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3" "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
}, },
"v1.16.10-rancher1-1": { "v1.16.10-rancher2-1": {
"etcd": "rancher/coreos-etcd:v3.3.15-rancher1", "etcd": "rancher/coreos-etcd:v3.3.15-rancher1",
"alpine": "rancher/rke-tools:v0.1.56", "alpine": "rancher/rke-tools:v0.1.56",
"nginxProxy": "rancher/rke-tools:v0.1.56", "nginxProxy": "rancher/rke-tools:v0.1.56",
@ -3776,18 +3776,18 @@
"coredns": "rancher/coredns-coredns:1.6.2", "coredns": "rancher/coredns-coredns:1.6.2",
"corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1", "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1",
"nodelocal": "rancher/k8s-dns-node-cache:1.15.7", "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
"kubernetes": "rancher/hyperkube:v1.16.10-rancher1", "kubernetes": "rancher/hyperkube:v1.16.10-rancher2",
"flannel": "rancher/coreos-flannel:v0.11.0-rancher1", "flannel": "rancher/coreos-flannel:v0.11.0-rancher1",
"flannelCni": "rancher/flannel-cni:v0.3.0-rancher5", "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
"calicoNode": "rancher/calico-node:v3.13.0", "calicoNode": "rancher/calico-node:v3.13.4",
"calicoCni": "rancher/calico-cni:v3.13.0", "calicoCni": "rancher/calico-cni:v3.13.4",
"calicoControllers": "rancher/calico-kube-controllers:v3.13.0", "calicoControllers": "rancher/calico-kube-controllers:v3.13.4",
"calicoCtl": "rancher/calico-ctl:v2.0.0", "calicoCtl": "rancher/calico-ctl:v3.13.4",
"calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"canalNode": "rancher/calico-node:v3.13.0", "canalNode": "rancher/calico-node:v3.13.4",
"canalCni": "rancher/calico-cni:v3.13.0", "canalCni": "rancher/calico-cni:v3.13.4",
"canalFlannel": "rancher/coreos-flannel:v0.11.0", "canalFlannel": "rancher/coreos-flannel:v0.11.0",
"canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"weaveNode": "weaveworks/weave-kube:2.5.2", "weaveNode": "weaveworks/weave-kube:2.5.2",
"weaveCni": "weaveworks/weave-npc:2.5.2", "weaveCni": "weaveworks/weave-npc:2.5.2",
"podInfraContainer": "rancher/pause:3.1", "podInfraContainer": "rancher/pause:3.1",
@ -4366,7 +4366,7 @@
"metricsServer": "rancher/metrics-server:v0.3.6", "metricsServer": "rancher/metrics-server:v0.3.6",
"windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3" "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
}, },
"v1.17.6-rancher1-1": { "v1.17.6-rancher2-1": {
"etcd": "rancher/coreos-etcd:v3.4.3-rancher1", "etcd": "rancher/coreos-etcd:v3.4.3-rancher1",
"alpine": "rancher/rke-tools:v0.1.56", "alpine": "rancher/rke-tools:v0.1.56",
"nginxProxy": "rancher/rke-tools:v0.1.56", "nginxProxy": "rancher/rke-tools:v0.1.56",
@ -4379,18 +4379,18 @@
"coredns": "rancher/coredns-coredns:1.6.5", "coredns": "rancher/coredns-coredns:1.6.5",
"corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1", "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1",
"nodelocal": "rancher/k8s-dns-node-cache:1.15.7", "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
"kubernetes": "rancher/hyperkube:v1.17.6-rancher1", "kubernetes": "rancher/hyperkube:v1.17.6-rancher2",
"flannel": "rancher/coreos-flannel:v0.11.0-rancher1", "flannel": "rancher/coreos-flannel:v0.11.0-rancher1",
"flannelCni": "rancher/flannel-cni:v0.3.0-rancher5", "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
"calicoNode": "rancher/calico-node:v3.13.0", "calicoNode": "rancher/calico-node:v3.13.4",
"calicoCni": "rancher/calico-cni:v3.13.0", "calicoCni": "rancher/calico-cni:v3.13.4",
"calicoControllers": "rancher/calico-kube-controllers:v3.13.0", "calicoControllers": "rancher/calico-kube-controllers:v3.13.4",
"calicoCtl": "rancher/calico-ctl:v2.0.0", "calicoCtl": "rancher/calico-ctl:v3.13.4",
"calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"canalNode": "rancher/calico-node:v3.13.0", "canalNode": "rancher/calico-node:v3.13.4",
"canalCni": "rancher/calico-cni:v3.13.0", "canalCni": "rancher/calico-cni:v3.13.4",
"canalFlannel": "rancher/coreos-flannel:v0.11.0", "canalFlannel": "rancher/coreos-flannel:v0.11.0",
"canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"weaveNode": "weaveworks/weave-kube:2.5.2", "weaveNode": "weaveworks/weave-kube:2.5.2",
"weaveCni": "weaveworks/weave-npc:2.5.2", "weaveCni": "weaveworks/weave-npc:2.5.2",
"podInfraContainer": "rancher/pause:3.1", "podInfraContainer": "rancher/pause:3.1",
@ -4399,7 +4399,7 @@
"metricsServer": "rancher/metrics-server:v0.3.6", "metricsServer": "rancher/metrics-server:v0.3.6",
"windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3" "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.3"
}, },
"v1.18.3-rancher1-1": { "v1.18.3-rancher2-1": {
"etcd": "rancher/coreos-etcd:v3.4.3-rancher1", "etcd": "rancher/coreos-etcd:v3.4.3-rancher1",
"alpine": "rancher/rke-tools:v0.1.56", "alpine": "rancher/rke-tools:v0.1.56",
"nginxProxy": "rancher/rke-tools:v0.1.56", "nginxProxy": "rancher/rke-tools:v0.1.56",
@ -4412,18 +4412,18 @@
"coredns": "rancher/coredns-coredns:1.6.9", "coredns": "rancher/coredns-coredns:1.6.9",
"corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1", "corednsAutoscaler": "rancher/cluster-proportional-autoscaler:1.7.1",
"nodelocal": "rancher/k8s-dns-node-cache:1.15.7", "nodelocal": "rancher/k8s-dns-node-cache:1.15.7",
"kubernetes": "rancher/hyperkube:v1.18.3-rancher1", "kubernetes": "rancher/hyperkube:v1.18.3-rancher2",
"flannel": "rancher/coreos-flannel:v0.11.0-rancher1", "flannel": "rancher/coreos-flannel:v0.11.0-rancher1",
"flannelCni": "rancher/flannel-cni:v0.3.0-rancher5", "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
"calicoNode": "rancher/calico-node:v3.13.0", "calicoNode": "rancher/calico-node:v3.13.4",
"calicoCni": "rancher/calico-cni:v3.13.0", "calicoCni": "rancher/calico-cni:v3.13.4",
"calicoControllers": "rancher/calico-kube-controllers:v3.13.0", "calicoControllers": "rancher/calico-kube-controllers:v3.13.4",
"calicoCtl": "rancher/calico-ctl:v2.0.0", "calicoCtl": "rancher/calico-ctl:v3.13.4",
"calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "calicoFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"canalNode": "rancher/calico-node:v3.13.0", "canalNode": "rancher/calico-node:v3.13.4",
"canalCni": "rancher/calico-cni:v3.13.0", "canalCni": "rancher/calico-cni:v3.13.4",
"canalFlannel": "rancher/coreos-flannel:v0.11.0", "canalFlannel": "rancher/coreos-flannel:v0.11.0",
"canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.0", "canalFlexVol": "rancher/calico-pod2daemon-flexvol:v3.13.4",
"weaveNode": "weaveworks/weave-kube:2.6.2", "weaveNode": "weaveworks/weave-kube:2.6.2",
"weaveCni": "weaveworks/weave-npc:2.6.2", "weaveCni": "weaveworks/weave-npc:2.6.2",
"podInfraContainer": "rancher/pause:3.1", "podInfraContainer": "rancher/pause:3.1",
@ -4665,7 +4665,7 @@
"minRKEVersion": "1.0.7", "minRKEVersion": "1.0.7",
"minRancherVersion": "2.3.7" "minRancherVersion": "2.3.7"
}, },
"v1.15.12-rancher1-2": { "v1.15.12-rancher2-2": {
"minRKEVersion": "1.0.7", "minRKEVersion": "1.0.7",
"minRancherVersion": "2.3.7" "minRancherVersion": "2.3.7"
}, },
@ -4673,7 +4673,7 @@
"maxRKEVersion": "0.2.8", "maxRKEVersion": "0.2.8",
"maxRancherVersion": "2.2.9" "maxRancherVersion": "2.2.9"
}, },
"v1.16.10-rancher1-1": { "v1.16.10-rancher2-1": {
"minRKEVersion": "1.0.7", "minRKEVersion": "1.0.7",
"minRancherVersion": "2.3.7" "minRancherVersion": "2.3.7"
}, },
@ -4701,11 +4701,11 @@
"minRKEVersion": "1.0.7", "minRKEVersion": "1.0.7",
"minRancherVersion": "2.3.7-rc0" "minRancherVersion": "2.3.7-rc0"
}, },
"v1.17.6-rancher1-1": { "v1.17.6-rancher2-1": {
"minRKEVersion": "1.0.7", "minRKEVersion": "1.0.7",
"minRancherVersion": "2.3.7" "minRancherVersion": "2.3.7"
}, },
"v1.18.3-rancher1-1": { "v1.18.3-rancher2-1": {
"minRKEVersion": "1.1.1-rc99", "minRKEVersion": "1.1.1-rc99",
"minRancherVersion": "2.4.4-rc0" "minRancherVersion": "2.4.4-rc0"
}, },
@ -4745,7 +4745,7 @@
}, },
"RKEDefaultK8sVersions": { "RKEDefaultK8sVersions": {
"0.3": "v1.16.3-rancher1-1", "0.3": "v1.16.3-rancher1-1",
"default": "v1.18.3-rancher1-1" "default": "v1.18.3-rancher2-1"
}, },
"K8sVersionDockerInfo": { "K8sVersionDockerInfo": {
"1.10": [ "1.10": [