Merge pull request #26777 from mrajashree/upd_rke

[2.3] Update rke vendor

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-20200421164156-025d63433813
+	github.com/rancher/kontainer-driver-metadata v0.0.0-20200422173059-969d71dca599
 	github.com/rancher/kontainer-engine v0.0.4-dev.0.20200403233022-1167e391df73
 	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.7-rc2
+	github.com/rancher/rke v1.0.7-rc3
 	github.com/rancher/types v0.0.0-20200417105211-b2b49a4bd8db
 	github.com/rancher/wrangler v0.4.1
 	github.com/robfig/cron v1.1.0

go.sum

@@ -638,8 +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-20200421164156-025d63433813 h1:snKz4/kjPfAjl1NtWXV51QNh26+dfethruyKlXuhwJ0=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200421164156-025d63433813/go.mod h1:KuGKsRpYUD0XBTTENJ1v/kBWqZUojerUGhunNuQppdU=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200422173059-969d71dca599 h1:sAWP/6EeNGuDG2Ug3+hYYhSoFO5VlENhGTq5Z4WVsAw=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200422173059-969d71dca599/go.mod h1:KuGKsRpYUD0XBTTENJ1v/kBWqZUojerUGhunNuQppdU=
 github.com/rancher/kontainer-engine v0.0.4-dev.0.20200403233022-1167e391df73 h1:PItEde9TqbUQ/5VFnUgI7amA1vHjxzDCNAgItbNS64c=
 github.com/rancher/kontainer-engine v0.0.4-dev.0.20200403233022-1167e391df73/go.mod h1:Eccd5R2X1vvjYg0O1gZ0jWAl+bDq6Egv/H2YzKz5tP0=
 github.com/rancher/machine v0.15.0-rancher25 h1:i78iohBm9QLmxHOMM1ZssYwSNIObPdDUQjZ9h1mo8Jc=
@@ -659,8 +659,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.7-rc2 h1:jrjifJXfmcHqYSfIE6BIQppMI/gfPc/fWTIYTCsCv9I=
-github.com/rancher/rke v1.0.7-rc2/go.mod h1:WHYdyeKz8P+DMIq/ZGyQ1JVHuDdARQED7DF1yC9/iUw=
+github.com/rancher/rke v1.0.7-rc3 h1:rq7AbOrVXTI6qL+uOGhBc1GRZvV+SXlDjcTriWEuNds=
+github.com/rancher/rke v1.0.7-rc3/go.mod h1:AH6lL5u7o0lDzQJ8/IdKNRn0jmyEkJmhvhxPsJ/OBdk=
 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_version_info.go

@@ -80,7 +80,7 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo {
 		// The Calico/Canal template in this version use functions that are only available in RKE v1.0.0 and up
 		// This version includes nodelocal dns only available in RKE v1.0.7 and up
 		"v1.15.11-rancher1-3": {
-			MinRancherVersion: "2.3.7",
+			MinRancherVersion: "2.3.7-rc0",
 			MinRKEVersion:     "1.0.7",
 		},
 		// The Calico/Canal template in this version use functions that are only available in RKE v1.0.0 and up

vendor/github.com/rancher/rke/cluster/defaults.go

@@ -436,7 +436,9 @@ func (c *Cluster) setClusterDNSDefaults() error {
 		logrus.Debugf("Cluster version [%s] is less than version [%s], using DNS provider [%s]", clusterSemVer, K8sVersionCoreDNSSemVer, DefaultDNSProvider)
 		ClusterDNSProvider = DefaultDNSProvider
 	}
-	c.DNS = &v3.DNSConfig{}
+	if c.DNS == nil {
+		c.DNS = &v3.DNSConfig{}
+	}
 	c.DNS.Provider = ClusterDNSProvider
 	logrus.Debugf("DNS provider set to [%s]", ClusterDNSProvider)
 	return nil

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-20200421164156-025d63433813
+# github.com/rancher/kontainer-driver-metadata v0.0.0-20200422173059-969d71dca599
 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.20200403233022-1167e391df73
@@ -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.7-0.20200421173341-69d32cd8a3ff
+# github.com/rancher/rke v1.0.7-rc3
 github.com/rancher/rke/addons
 github.com/rancher/rke/authz
 github.com/rancher/rke/cloudprovider