kontainer-driver-metadata vendor update

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/mattn/go-colorable v0.1.0
 	github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
 	github.com/pkg/errors v0.8.1
-	github.com/rancher/kontainer-driver-metadata v0.0.0-20191021164950-6514452b9732
+	github.com/rancher/kontainer-driver-metadata v0.0.0-20191113181829-54094fc6ca6f
 	github.com/rancher/norman v0.0.0-20191111202053-1fcac7eb4fea
 	github.com/rancher/types v0.0.0-20191113224327-a0d18782c0f1
 	github.com/sirupsen/logrus v1.4.2

go.sum

@@ -519,12 +519,12 @@ github.com/prometheus/tsdb v0.8.0/go.mod h1:fSI0j+IUQrDd7+ZtR9WKIGtoYAYAJUKcKhYL
 github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
 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-20191021164950-6514452b9732 h1:6InjIL/kY99O1kdLLmiYVaUkMRhVEZjjlz7WRxRJraQ=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20191113181829-54094fc6ca6f h1:uFLu6lP2QOMw1+zHNukpa+FC1SCm9mFgbFJSU0Xl1bg=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20191021164950-6514452b9732/go.mod h1:n9MKsJByqAqhVG61d9G5pbJuKcHUMXUw97YF8+98ar0=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20191113181829-54094fc6ca6f/go.mod h1:psQ6U4P3qj+ZBbniVuhDQ0tuXc5M7+MReBdPlyTQZLI=
-github.com/rancher/norman v0.0.0-20190930164704-e09204b63081/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
+github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
 github.com/rancher/norman v0.0.0-20191111202053-1fcac7eb4fea h1:XMBnoi65IA7PO17j6JBnPAbJIDLf8wXho9WgDb/TXVo=
 github.com/rancher/norman v0.0.0-20191111202053-1fcac7eb4fea/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
-github.com/rancher/types v0.0.0-20190930165650-6bbedae77a35/go.mod h1:I0hSpsw/ZvWuOOvhiExji5IIkeQtmn4IvFcn7nbjhrk=
+github.com/rancher/types v0.0.0-20191108235045-716d86fa44c9/go.mod h1:K5zlxVpe7bY2QgOs1YUcU8dVXtzKncxpGEcvxGMgr0k=
 github.com/rancher/types v0.0.0-20191113224327-a0d18782c0f1 h1:DOyUBD2nMF0JSG6+3PzN9I4XMZCoOpGc3BVo778PgJ4=
 github.com/rancher/types v0.0.0-20191113224327-a0d18782c0f1/go.mod h1:BTwoSAQPH4x/QEUtGF/ZDZyapdUSZiBYm3zNuDLLQD4=
 github.com/rancher/wrangler v0.1.5 h1:HiXOeP6Kci2DK+e04D1g6INT77xAYpAr54zmTTe0Spk=
@@ -734,7 +734,6 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190926165942-a8d5d34286bd/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c h1:IGkKhmfzcztjm6gYkykvu/NiS8kaqbCWAEWWAyf8J5U=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

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

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/blang/semver"
 	"github.com/rancher/kontainer-driver-metadata/rke/templates"
+	"github.com/sirupsen/logrus"
 	"os"
 	"strings"
 
@@ -43,9 +44,10 @@ type Data struct {
 }
 
 var (
-	DriverData Data
+	DriverData     Data
-	TemplateData  map[string]map[string]string
+	TemplateData   map[string]map[string]string
-	m          = image.Mirror
+	MissedTemplate map[string][]string
+	m              = image.Mirror
 )
 
 func init() {
@@ -89,6 +91,7 @@ func validateDefaultPresent(versions map[string]string) {
 
 func validateTemplateMatch() {
 	TemplateData = map[string]map[string]string{}
+	MissedTemplate = map[string][]string{}
 	for k8sVersion := range DriverData.K8sVersionRKESystemImages {
 		toMatch, err := semver.Make(k8sVersion[1:])
 		if err != nil {
@@ -117,7 +120,13 @@ func validateTemplateMatch() {
 				}
 			}
 			if matchedKey == "" {
-				panic(fmt.Sprintf("no template found for k8sVersion %s plugin %s", k8sVersion, plugin))
+				if val, ok := MissedTemplate[plugin]; ok {
+					val = append(val, k8sVersion)
+					MissedTemplate[plugin] = val
+				} else {
+					MissedTemplate[plugin] = []string{k8sVersion}
+				}
+				continue
 			}
 			TemplateData[k8sVersion][plugin] = fmt.Sprintf("range=%s key=%s", matchedRange, matchedKey)
 		}
@@ -129,7 +138,6 @@ func GenerateData() {
 		splitStr := strings.SplitN(os.Args[1], "=", 2)
 		if len(splitStr) == 2 {
 			if splitStr[0] == "--write-data" && splitStr[1] == "true" {
-				
 				buf := new(bytes.Buffer)
 				enc := json.NewEncoder(buf)
 				enc.SetEscapeHTML(false)
@@ -140,6 +148,13 @@ func GenerateData() {
 				}
 				fmt.Println(buf.String())
 
+				if len(MissedTemplate) != 0 {
+					logrus.Warnf("found k8s versions without a template")
+					for plugin, data := range MissedTemplate {
+						logrus.Warnf("no %s template for k8sVersions %v \n", plugin, data)
+					}
+				}
+
 				fmt.Println("generating data.json")
 				//todo: zip file
 				strData, _ := json.MarshalIndent(DriverData, "", " ")

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

@@ -1324,6 +1324,35 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			CoreDNS:                   m("coredns/coredns:1.3.1"),
 			CoreDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
 		},
+		// Enabled in Rancher v2.3.0
+		"v1.14.8-rancher2-1": {
+			Etcd:                      m("quay.io/coreos/etcd:v3.3.10-rancher1"),
+			Kubernetes:                m("rancher/hyperkube:v1.14.8-rancher2"),
+			Alpine:                    m("rancher/rke-tools:v0.1.51"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.51"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.51"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
+			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.10.0-rancher1"),
+			FlannelCNI:                m("rancher/flannel-cni:v0.3.0-rancher5"),
+			CalicoNode:                m("quay.io/calico/node:v3.4.0"),
+			CalicoCNI:                 m("quay.io/calico/cni:v3.4.0"),
+			CalicoCtl:                 m("quay.io/calico/ctl:v2.0.0"),
+			CanalNode:                 m("quay.io/calico/node:v3.4.0"),
+			CanalCNI:                  m("quay.io/calico/cni:v3.4.0"),
+			CanalFlannel:              m("quay.io/coreos/flannel:v0.10.0"),
+			WeaveNode:                 m("weaveworks/weave-kube:2.5.0"),
+			WeaveCNI:                  m("weaveworks/weave-npc:2.5.0"),
+			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.1"),
+			CoreDNS:                   m("coredns/coredns:1.3.1"),
+			CoreDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
+		},
 		// Experimental in Rancher v2.2.5
 		"v1.15.0-rancher1-1": {
 			Etcd:                      m("quay.io/coreos/etcd:v3.3.10-rancher1"),
@@ -1535,6 +1564,37 @@ 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"),
 		},
+		// Enabled in Rancher v2.3.0
+		"v1.15.5-rancher2-2": {
+			Etcd:                      m("quay.io/coreos/etcd:v3.3.10-rancher1"),
+			Kubernetes:                m("rancher/hyperkube:v1.15.5-rancher2"),
+			Alpine:                    m("rancher/rke-tools:v0.1.51"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.51"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.51"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
+			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.7.4"),
+			CalicoCNI:                 m("quay.io/calico/cni:v3.7.4"),
+			CalicoCtl:                 m("quay.io/calico/ctl:v2.0.0"),
+			CalicoControllers:         m("quay.io/calico/kube-controllers:v3.7.4"),
+			CanalNode:                 m("quay.io/calico/node:v3.7.4"),
+			CanalCNI:                  m("quay.io/calico/cni:v3.7.4"),
+			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"),
+			WindowsPodInfraContainer:  m("rancher/kubelet-pause:v0.1.3"),
+		},
 		// Experimental in Rancher v2.3.0
 		"v1.16.1-rancher1-1": {
 			Etcd:                      m("quay.io/coreos/etcd:v3.3.15-rancher1"),
@@ -1599,6 +1659,38 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			CoreDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
 			WindowsPodInfraContainer:  m("rancher/kubelet-pause:v0.1.3"),
 		},
+		// Experimental in Rancher v2.3.0
+		"v1.16.2-rancher2-1": {
+			Etcd:                      m("quay.io/coreos/etcd:v3.3.15-rancher1"),
+			Kubernetes:                m("rancher/hyperkube:v1.16.2-rancher2"),
+			Alpine:                    m("rancher/rke-tools:v0.1.51"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.51"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.51"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
+			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.7.1"),
+			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.8.1"),
+			CalicoCNI:                 m("quay.io/calico/cni:v3.8.1"),
+			CalicoControllers:         m("quay.io/calico/kube-controllers:v3.8.1"),
+			CalicoFlexVol:             m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
+			CanalNode:                 m("quay.io/calico/node:v3.8.1"),
+			CanalCNI:                  m("quay.io/calico/cni:v3.8.1"),
+			CanalFlannel:              m("quay.io/coreos/flannel:v0.11.0"),
+			CanalFlexVol:              m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
+			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.4"),
+			CoreDNS:                   m("coredns/coredns:1.6.2"),
+			CoreDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
+			WindowsPodInfraContainer:  m("rancher/kubelet-pause:v0.1.3"),
+		},
 		// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
 		// without all clusters being restarted
 		"v1.11.9-rancher1-3": {

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

@@ -10,6 +10,7 @@ func loadRancherDefaultK8sVersions() map[string]string {
 	return map[string]string{
 		"2.3.0": "v1.15.x",
 		"2.3.1": "v1.15.x",
+		"2.3.2": "v1.15.x",
 		"2.3":   "v1.16.x",
 		// rancher will use default if its version is absent
 		"default": "v1.16.x",
@@ -18,9 +19,9 @@ func loadRancherDefaultK8sVersions() map[string]string {
 
 func loadRKEDefaultK8sVersions() map[string]string {
 	return map[string]string{
-		"0.3": "v1.16.2-rancher1-1",
+		"0.3": "v1.16.2-rancher2-1",
 		// rke will use default if its version is absent
-		"default": "v1.16.2-rancher1-1",
+		"default": "v1.16.2-rancher2-1",
 	}
 }
 

vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/nginx-ingress.go

@@ -248,6 +248,9 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+{{if .ExtraEnvs}}
+{{ toYaml .ExtraEnvs | indent 12}}
+{{end}}
           ports:
           - name: http
             containerPort: 80
@@ -272,6 +275,15 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
+{{if .ExtraVolumeMounts}}
+          volumeMounts:
+{{ toYaml .ExtraVolumeMounts | indent 12}}
+{{end}}
+{{if .ExtraVolumes}}
+      volumes:
+{{ toYaml .ExtraVolumes | indent 8}}
+{{end}}
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -595,6 +607,9 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+{{if .ExtraEnvs}}
+{{ toYaml .ExtraEnvs | indent 12}}
+{{end}}
           ports:
           - name: http
             containerPort: 80
@@ -619,6 +634,15 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
+{{if .ExtraVolumeMounts}}
+          volumeMounts:
+{{ toYaml .ExtraVolumeMounts | indent 12}}
+{{end}}
+{{if .ExtraVolumes}}
+      volumes:
+{{ toYaml .ExtraVolumes | indent 8}}
+{{end}}
+
 ---
 apiVersion: apps/v1
 kind: Deployment

vendor/modules.txt

@@ -129,7 +129,7 @@ github.com/prometheus/procfs
 github.com/prometheus/procfs/nfs
 github.com/prometheus/procfs/xfs
 github.com/prometheus/procfs/internal/util
-# github.com/rancher/kontainer-driver-metadata v0.0.0-20191021164950-6514452b9732
+# github.com/rancher/kontainer-driver-metadata v0.0.0-20191113181829-54094fc6ca6f
 github.com/rancher/kontainer-driver-metadata/rke/templates
 github.com/rancher/kontainer-driver-metadata/rke
 # github.com/rancher/norman v0.0.0-20191111202053-1fcac7eb4fea