vendor update kdm

go.mod

@@ -70,13 +70,13 @@ require (
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v1.4.0
 	github.com/prometheus/common v0.6.0
-	github.com/rancher/kontainer-driver-metadata v0.0.0-20200327203707-3ac337455dcc
+	github.com/rancher/kontainer-driver-metadata v0.0.0-20200328181903-2d89cfb8abb2
 	github.com/rancher/kontainer-engine v0.0.4-dev.0.20200326175710-485fea53750a
 	github.com/rancher/machine v0.15.0-rancher25
 	github.com/rancher/norman v0.0.0-20200227003532-35fa47cccad7
 	github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a
 	github.com/rancher/remotedialer v0.2.5
-	github.com/rancher/rke v1.0.6-rc4
+	github.com/rancher/rke v1.0.6-rc4.0.20200328190908-849261ddcc22
 	github.com/rancher/types v0.0.0-20191226170233-4d49bbf42146
 	github.com/rancher/wrangler v0.4.1
 	github.com/robfig/cron v1.1.0

go.sum

@@ -638,12 +638,8 @@ github.com/rackspace/gophercloud v0.0.0-20150408191457-ce0f487f6747/go.mod h1:4b
 github.com/rancher/client-go v1.16.0-rancher.3 h1:bOA0zwtJi8wUeldqfrCGyDRuN6oW+zJ092i/OhWP2nU=
 github.com/rancher/client-go v1.16.0-rancher.3/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk=
 github.com/rancher/kontainer-driver-metadata v0.0.0-20190930170218-cea47774d036/go.mod h1:n9MKsJByqAqhVG61d9G5pbJuKcHUMXUw97YF8+98ar0=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200325193009-ba905565142c h1:2eZSmdbxgfPmo2fikB7o0+jNXE1H2rAiz/UIM4a0t0Q=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200325193009-ba905565142c/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200327172209-44d59a43e621 h1:HqVaJoT2l7YotNpr93JDlAwvOrd9hj65fvKUPFPQBh8=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200327172209-44d59a43e621/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200327203707-3ac337455dcc h1:WJBHBO46aFv4mG33qJHujCiGabp9h0zii4wLex8szPY=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200327203707-3ac337455dcc/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200328181903-2d89cfb8abb2 h1:PiA+DJMxLtSYT5LLi+9iYyQ2T0pECB0vAtn3BIzHFXU=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200328181903-2d89cfb8abb2/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
 github.com/rancher/kontainer-engine v0.0.4-dev.0.20200326175710-485fea53750a h1:a9NRVA29QxXFpwXe7ifurgHVQvBJ5vspw7ZAEd/dmh0=
 github.com/rancher/kontainer-engine v0.0.4-dev.0.20200326175710-485fea53750a/go.mod h1:Eccd5R2X1vvjYg0O1gZ0jWAl+bDq6Egv/H2YzKz5tP0=
 github.com/rancher/machine v0.15.0-rancher25 h1:i78iohBm9QLmxHOMM1ZssYwSNIObPdDUQjZ9h1mo8Jc=
@@ -664,12 +660,8 @@ github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a/go.mod h1:YW8w
 github.com/rancher/remotedialer v0.2.5 h1:rNMMcJp5fU7FZ3wGFKSmDrXrSt8MYo5na4CzXddIr2A=
 github.com/rancher/remotedialer v0.2.5/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
 github.com/rancher/rke v0.3.0-rc11.0.20190930172345-88449ec73b31/go.mod h1:5uw/a0TlRpyf2ASPgEo4HBSEFsc80zuR4raGwazwJa8=
-github.com/rancher/rke v1.0.6-rc2 h1:KibYyTSe0/XqzdxyqNOfoa16kHV9WhyIarc1ZfT6ox4=
-github.com/rancher/rke v1.0.6-rc2/go.mod h1:kTkTxQxLMelaSvbfegidyqI9e5fpgo9k1bsLoLz33v0=
-github.com/rancher/rke v1.0.6-rc3 h1:PwHX+S2TQl0j1slEaJpm12IOoD6C0RSgR/rQDKsQO14=
-github.com/rancher/rke v1.0.6-rc3/go.mod h1:ezCZwNOJDusezn5d3xG3sIgyM1gz6apQmzrC/4IJZ5s=
-github.com/rancher/rke v1.0.6-rc4 h1:Oa8kBVM84utuE7VO5rC8iy/2x2lLu9guxaHr8vrPUZI=
-github.com/rancher/rke v1.0.6-rc4/go.mod h1:UGzO9fZeVBY08CXAfBDOG9qAOoUPNVhJqvlVYKwkg1Q=
+github.com/rancher/rke v1.0.6-rc4.0.20200328190908-849261ddcc22 h1:tEzvn/VZ3SNrzL+HYmjNNSnmfSR/9A1x3v5msIl5Q5E=
+github.com/rancher/rke v1.0.6-rc4.0.20200328190908-849261ddcc22/go.mod h1:TpAO0CkZCE3A/v3BUY21p9nJcqlHQx1rStRS83S2hkc=
 github.com/rancher/saml v0.0.0-20180713225824-ce1532152fde h1:+gd9up4jLeFeuNC5bHn7qfRXZO9WKtBe8b4vhucg9lg=
 github.com/rancher/saml v0.0.0-20180713225824-ce1532152fde h1:+gd9up4jLeFeuNC5bHn7qfRXZO9WKtBe8b4vhucg9lg=
 github.com/rancher/saml v0.0.0-20180713225824-ce1532152fde/go.mod h1:Bp1IBnlwVB1EqRfSKecoPyf+1Wjh8zykMjlq4vJJhxY=

vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go

@@ -1807,6 +1807,36 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			CoreDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
 			WindowsPodInfraContainer:  m("rancher/kubelet-pause:v0.1.3"),
 		},
+		// Copy for clusters from 2.2.10
+		"v1.15.11-rancher1-0": {
+			Etcd:                      m("quay.io/coreos/etcd:v3.3.10-rancher1"),
+			Kubernetes:                m("rancher/hyperkube:v1.15.11-rancher1"),
+			Alpine:                    m("rancher/rke-tools:v0.1.52"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.52"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.52"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
+			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"),
+			KubeDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
+			Flannel:                   m("quay.io/coreos/flannel:v0.11.0-rancher1"),
+			FlannelCNI:                m("rancher/flannel-cni:v0.3.0-rancher5"),
+			CalicoNode:                m("quay.io/calico/node:v3.13.0"),
+			CalicoCNI:                 m("quay.io/calico/cni:v3.13.0"),
+			CalicoCtl:                 m("quay.io/calico/ctl:v2.0.0"),
+			CalicoControllers:         m("quay.io/calico/kube-controllers:v3.13.0"),
+			CanalNode:                 m("quay.io/calico/node:v3.13.0"),
+			CanalCNI:                  m("quay.io/calico/cni:v3.13.0"),
+			CanalFlannel:              m("quay.io/coreos/flannel:v0.11.0"),
+			WeaveNode:                 m("weaveworks/weave-kube:2.5.2"),
+			WeaveCNI:                  m("weaveworks/weave-npc:2.5.2"),
+			PodInfraContainer:         m("gcr.io/google_containers/pause:3.1"),
+			Ingress:                   m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
+			IngressBackend:            m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
+			MetricsServer:             m("gcr.io/google_containers/metrics-server:v0.3.3"),
+			CoreDNS:                   m("coredns/coredns:1.3.1"),
+			CoreDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
+		},
 		// Out of band post v2.3.5
 		"v1.15.11-rancher1-1": {
 			Etcd:                      m("quay.io/coreos/etcd:v3.3.10-rancher1"),

vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go

@@ -67,6 +67,18 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo {
 			MaxRancherVersion: "2.2.9",
 			MaxRKEVersion:     "0.2.8",
 		},
+		"v1.15.11-rancher1-2": {
+			MinRancherVersion: "2.3.6",
+			MinRKEVersion:     "1.0.6",
+		},
+		"v1.16.8-rancher1-2": {
+			MinRancherVersion: "2.3.6",
+			MinRKEVersion:     "1.0.6",
+		},
+		"v1.17.4-rancher1-2": {
+			MinRancherVersion: "2.3.6",
+			MinRKEVersion:     "1.0.6",
+		},
 		"v1.8.10-rancher1-1": {
 			DeprecateRKEVersion:     "0.2.2",
 			DeprecateRancherVersion: "2.2",

vendor/github.com/rancher/rke/metadata/metadata.go

@@ -30,7 +30,7 @@ func InitMetadata(ctx context.Context) error {
 	return nil
 }
 
-const RKEVersionDev = "v0.2.3"
+const RKEVersionDev = "v1.0.6"
 
 func initAddonTemplates() {
 	K8sVersionToTemplates = rke.DriverData.K8sVersionedTemplates

vendor/modules.txt

@@ -287,7 +287,7 @@ github.com/prometheus/common/model
 # github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084
 github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/fs
-# github.com/rancher/kontainer-driver-metadata v0.0.0-20200327203707-3ac337455dcc
+# github.com/rancher/kontainer-driver-metadata v0.0.0-20200328181903-2d89cfb8abb2
 github.com/rancher/kontainer-driver-metadata/rke
 github.com/rancher/kontainer-driver-metadata/rke/templates
 # github.com/rancher/kontainer-engine v0.0.4-dev.0.20200326175710-485fea53750a
@@ -364,7 +364,7 @@ github.com/rancher/rdns-server/model
 # github.com/rancher/remotedialer v0.2.5
 github.com/rancher/remotedialer
 github.com/rancher/remotedialer/metrics
-# github.com/rancher/rke v1.0.6-rc4
+# github.com/rancher/rke v1.0.6-rc4.0.20200328190908-849261ddcc22
 github.com/rancher/rke/addons
 github.com/rancher/rke/authz
 github.com/rancher/rke/cloudprovider