Vendor and go mod changes

go.mod

@@ -32,9 +32,9 @@ require (
 	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/opencontainers/image-spec v0.0.0-20170929214853-7c889fafd04a // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18
+	github.com/rancher/kontainer-driver-metadata v0.0.0-20190829181508-f5abbfa5182e
 	github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0
-	github.com/rancher/types v0.0.0-20190823205914-444dc01b3d86
+	github.com/rancher/types v0.0.0-20190827214052-704648244586
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
 	github.com/soheilhy/cmux v0.1.4 // indirect

go.sum

@@ -181,18 +181,14 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20190823210613-624182a785ce h1:4onzkfpjfusENeAFn7NhUSCdmBkFez3dRAaqDQGV8ng=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20190829181508-f5abbfa5182e h1:IH/kDn1QKwfqVhqRfbNwmjcj4rUMpHUpjKPRjunlo9Q=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20190823210613-624182a785ce/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20190829181508-f5abbfa5182e/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20190826223322-3e1df77e6153 h1:MzkL/BHjjoCYmTyP5GfJW0Bn1bsGKOF70//wDoNwPiI=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20190826223322-3e1df77e6153/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18 h1:Muzkw/vWJaqXLvxJvI7C/ZkQ5n/8ypvGVpvZwnR/YIQ=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
 github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0 h1:bNG4b0CTTBE8yEamIz8RYcfz+7kfK9N8YTvyiykRCS8=
 github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0/go.mod h1:KwP6RD4rVMdK8XK0wqZaptrhTn/TO4kXU3doh4iatQU=
 github.com/rancher/types v0.0.0-20190822170951-b99efa820bc3 h1:4mz/J0iEtW/VDtjN3zI9B4g49MKeoLHkHZKJGqRN7xg=
 github.com/rancher/types v0.0.0-20190822170951-b99efa820bc3/go.mod h1:9L7VLTwNVt7vJYwP/7xrQ4tWghDQ+zl9//RTqRjGxes=
-github.com/rancher/types v0.0.0-20190823205914-444dc01b3d86 h1:s9FA2dfEVW9epZERVZwy6GZMzUMusXpkwxz1CMLqq2o=
+github.com/rancher/types v0.0.0-20190827214052-704648244586 h1:4GEIdOsBFhWjlURz2xfyv1+lZ+19TGwflJmw27Ry5no=
-github.com/rancher/types v0.0.0-20190823205914-444dc01b3d86/go.mod h1:9L7VLTwNVt7vJYwP/7xrQ4tWghDQ+zl9//RTqRjGxes=
+github.com/rancher/types v0.0.0-20190827214052-704648244586/go.mod h1:9L7VLTwNVt7vJYwP/7xrQ4tWghDQ+zl9//RTqRjGxes=
 github.com/rancher/wrangler v0.1.5 h1:HiXOeP6Kci2DK+e04D1g6INT77xAYpAr54zmTTe0Spk=
 github.com/rancher/wrangler v0.1.5/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xsr+XGpWyE=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

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

@@ -183,6 +183,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       tolerations:
         # Make sure calico/node gets scheduled on all nodes.
         - effect: NoSchedule
@@ -743,6 +749,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       tolerations:
         # Make sure calico-node gets scheduled on all nodes.
         - effect: NoSchedule
@@ -1591,6 +1603,9 @@ spec:
     spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
       hostNetwork: true
       tolerations:
         # Make sure calico-node gets scheduled on all nodes.
@@ -2350,6 +2365,9 @@ spec:
     spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
       hostNetwork: true
       tolerations:
         # Make sure calico-node gets scheduled on all nodes.

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

@@ -241,6 +241,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       serviceAccountName: canal
       tolerations:
         # Tolerate this effect so the pods will be schedulable at all times
@@ -835,6 +841,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       tolerations:
         # Make sure canal gets scheduled on all nodes.
         - effect: NoSchedule
@@ -1436,6 +1448,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       tolerations:
         # Make sure canal gets scheduled on all nodes.
         - effect: NoSchedule
@@ -2154,6 +2172,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       tolerations:
         # Tolerate this effect so the pods will be schedulable at all times
         - effect: NoSchedule

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

@@ -125,6 +125,13 @@ spec:
           operator: Exists
       nodeSelector:
         beta.kubernetes.io/os: linux
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                - key: node-role.kubernetes.io/worker
+                  operator: Exists
       {{ range $k, $v := .NodeSelector }}
         {{ $k }}: "{{ $v }}"
       {{ end }}
@@ -233,6 +240,13 @@ spec:
 {{- end }}
       nodeSelector:
         beta.kubernetes.io/os: linux
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                - key: node-role.kubernetes.io/worker
+                  operator: Exists
       tolerations:
       - effect: NoExecute
         operator: Exists

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

@@ -105,6 +105,12 @@ spec:
                   operator: NotIn
                   values:
                     - windows
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       serviceAccountName: flannel
       containers:
       - name: kube-flannel
@@ -362,6 +368,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       tolerations:
       - operator: Exists
       {{- if eq .RBACConfig "rbac"}}
@@ -606,6 +618,12 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       tolerations:
       - operator: Exists
       {{- if eq .RBACConfig "rbac"}}

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

@@ -24,6 +24,8 @@ spec:
                   operator: NotIn
                   values:
                     - windows
+                - key: node-role.kubernetes.io/worker
+                  operator: Exists
       serviceAccountName: kube-dns-autoscaler
       tolerations:
       - effect: NoExecute
@@ -127,10 +129,12 @@ spec:
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+{{if .NodeSelector}}
       nodeSelector:
       {{ range $k, $v := .NodeSelector }}
         {{ $k }}: "{{ $v }}"
       {{ end }}
+{{end}}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -150,6 +154,8 @@ spec:
                   operator: NotIn
                   values:
                     - windows
+                - key: node-role.kubernetes.io/worker
+                  operator: Exists
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"

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

@@ -115,6 +115,14 @@ spec:
                   operator: NotIn
                   values:
                     - windows
+                - key: node-role.kubernetes.io/worker
+                  operator: Exists
+{{if .NodeSelector}}
+      nodeSelector:
+      {{ range $k, $v := .NodeSelector }}
+        {{ $k }}: "{{ $v }}"
+      {{ end }}
+{{end}}
       serviceAccountName: metrics-server
       tolerations:
       - effect: NoExecute

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

@@ -186,10 +186,15 @@ spec:
                   values:
                     - windows
       hostNetwork: true
+      {{if .DNSPolicy}}
+      dnsPolicy: {{.DNSPolicy}}
+      {{end}}
+{{if .NodeSelector}}
       nodeSelector:
       {{ range $k, $v := .NodeSelector }}
         {{ $k }}: "{{ $v }}"
       {{ end }}
+{{end}}
       {{if eq .RBACConfig "rbac"}}
       serviceAccountName: nginx-ingress-serviceaccount
       {{ end }}
@@ -523,14 +528,18 @@ spec:
                   operator: NotIn
                   values:
                     - windows
+                - key: node-role.kubernetes.io/worker
+                  operator: Exists
       hostNetwork: true
       {{if .DNSPolicy}}
       dnsPolicy: {{.DNSPolicy}}
       {{end}}
+{{if .NodeSelector}}
       nodeSelector:
       {{ range $k, $v := .NodeSelector }}
         {{ $k }}: "{{ $v }}"
       {{ end }}
+{{end}}
       {{if eq .RBACConfig "rbac"}}
       serviceAccountName: nginx-ingress-serviceaccount
       {{ end }}

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

@@ -37,6 +37,12 @@ items:
                       operator: NotIn
                       values:
                         - windows
+{{if .NodeSelector}}
+          nodeSelector:
+            {{ range $k, $v := .NodeSelector }}
+              {{ $k }}: "{{ $v }}"
+            {{ end }}
+{{end}}
           containers:
             - name: weave
               command:

vendor/github.com/rancher/types/apis/management.cattle.io/v3/backup_types.go

@@ -10,7 +10,6 @@ import (
 const (
 	BackupConditionCreated   condition.Cond = "Created"
 	BackupConditionCompleted condition.Cond = "Completed"
-	BackupConditionRestored  condition.Cond = "Restored"
 )
 
 type BackupConfig struct {
@@ -22,6 +21,8 @@ type BackupConfig struct {
 	Retention int `yaml:"retention" json:"retention,omitempty" norman:"default=6"`
 	// s3 target
 	S3BackupConfig *S3BackupConfig `yaml:",omitempty" json:"s3BackupConfig"`
+	// replace special characters in snapshot names
+	SafeTimestamp bool `yaml:"safe_timestamp" json:"safeTimestamp,omitempty"`
 }
 
 type S3BackupConfig struct {
@@ -54,13 +55,13 @@ type EtcdBackup struct {
 
 type EtcdBackupSpec struct {
 	// cluster ID
-	ClusterID string `json:"clusterId,omitempty" norman:"required,type=reference[cluster]"`
+	ClusterID string `json:"clusterId,omitempty" norman:"required,type=reference[cluster],noupdate"`
 	// manual backup flag
 	Manual bool `yaml:"manual" json:"manual,omitempty"`
 	// actual file name on the target
-	Filename string `yaml:"filename" json:"filename,omitempty"`
+	Filename string `yaml:"filename" json:"filename,omitempty" norman:"noupdate"`
 	// backupConfig
-	BackupConfig BackupConfig `yaml:",omitempty" json:"backupConfig,omitempty"`
+	BackupConfig BackupConfig `yaml:",omitempty" json:"backupConfig,omitempty" norman:"noupdate"`
 }
 
 type EtcdBackupStatus struct {

vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go

@@ -241,6 +241,7 @@ type Capabilities struct {
 	IngressCapabilities      []IngressCapabilities    `json:"ingressCapabilities,omitempty"`
 	NodePoolScalingSupported bool                     `json:"nodePoolScalingSupported,omitempty"`
 	NodePortRange            string                   `json:"nodePortRange,omitempty"`
+	TaintSupport             *bool                    `json:"taintSupport,omitempty"`
 }
 
 type LoadBalancerCapabilities struct {

vendor/github.com/rancher/types/apis/management.cattle.io/v3/multi_cluster_app.go

@@ -28,6 +28,8 @@ type MultiClusterApp struct {
 type MultiClusterAppSpec struct {
 	TemplateVersionName  string          `json:"templateVersionName,omitempty" norman:"type=reference[templateVersion],required"`
 	Answers              []Answer        `json:"answers,omitempty"`
+	Wait                 bool            `json:"wait,omitempty"`
+	Timeout              int             `json:"timeout,omitempty" norman:"min=1,default=300"`
 	Targets              []Target        `json:"targets,omitempty" norman:"required,noupdate"`
 	Members              []Member        `json:"members,omitempty"`
 	Roles                []string        `json:"roles,omitempty" norman:"type=array[reference[roleTemplate]],required"`

vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go

@@ -329,6 +329,8 @@ type NetworkConfig struct {
 	FlannelNetworkProvider *FlannelNetworkProvider `yaml:"flannel_network_provider,omitempty" json:"flannelNetworkProvider,omitempty"`
 	// WeaveNetworkProvider
 	WeaveNetworkProvider *WeaveNetworkProvider `yaml:"weave_network_provider,omitempty" json:"weaveNetworkProvider,omitempty"`
+	// NodeSelector key pair
+	NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
 }
 
 type AuthWebhookConfig struct {
@@ -735,6 +737,8 @@ type MonitoringConfig struct {
 	Provider string `yaml:"provider" json:"provider,omitempty" norman:"default=metrics-server"`
 	// Metrics server options
 	Options map[string]string `yaml:"options" json:"options,omitempty"`
+	// NodeSelector key pair
+	NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
 }
 
 type RestoreConfig struct {

vendor/github.com/rancher/types/apis/management.cattle.io/v3/tools_system_images.go

@@ -21,12 +21,12 @@ var (
 		PipelineSystemImages: projectv3.PipelineSystemImages{
 			Jenkins:       m("rancher/pipeline-jenkins-server:v0.1.3"),
 			JenkinsJnlp:   m("jenkins/jnlp-slave:3.10-1-alpine"),
-			AlpineGit:     m("rancher/pipeline-tools:v0.1.11"),
+			AlpineGit:     m("rancher/pipeline-tools:v0.1.12"),
 			PluginsDocker: m("plugins/docker:17.12"),
 			Minio:         m("minio/minio:RELEASE.2018-05-25T19-49-13Z"),
 			Registry:      m("registry:2"),
-			RegistryProxy: m("rancher/pipeline-tools:v0.1.11"),
+			RegistryProxy: m("rancher/pipeline-tools:v0.1.12"),
-			KubeApply:     m("rancher/pipeline-tools:v0.1.11"),
+			KubeApply:     m("rancher/pipeline-tools:v0.1.12"),
 		},
 		LoggingSystemImages: LoggingSystemImages{
 			Fluentd:                       m("rancher/fluentd:v0.1.11"),

vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -580,6 +580,11 @@ func (in *Capabilities) DeepCopyInto(out *Capabilities) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.TaintSupport != nil {
+		in, out := &in.TaintSupport, &out.TaintSupport
+		*out = new(bool)
+		**out = **in
+	}
 	return
 }
 
@@ -4867,6 +4872,13 @@ func (in *MonitoringConfig) DeepCopyInto(out *MonitoringConfig) {
 			(*out)[key] = val
 		}
 	}
+	if in.NodeSelector != nil {
+		in, out := &in.NodeSelector, &out.NodeSelector
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	return
 }
 
@@ -5199,6 +5211,13 @@ func (in *NetworkConfig) DeepCopyInto(out *NetworkConfig) {
 		*out = new(WeaveNetworkProvider)
 		**out = **in
 	}
+	if in.NodeSelector != nil {
+		in, out := &in.NodeSelector, &out.NodeSelector
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	return
 }
 

vendor/modules.txt

@@ -105,7 +105,7 @@ github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
 # github.com/prometheus/procfs v0.0.3
 github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/fs
-# github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18
+# github.com/rancher/kontainer-driver-metadata v0.0.0-20190829181508-f5abbfa5182e
 github.com/rancher/kontainer-driver-metadata/rke/templates
 github.com/rancher/kontainer-driver-metadata/rke
 # github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0
@@ -123,7 +123,7 @@ github.com/rancher/norman/types/slice
 github.com/rancher/norman/httperror
 github.com/rancher/norman/types/definition
 github.com/rancher/norman/types/values
-# github.com/rancher/types v0.0.0-20190823205914-444dc01b3d86
+# github.com/rancher/types v0.0.0-20190827214052-704648244586
 github.com/rancher/types/apis/management.cattle.io/v3
 github.com/rancher/types/apis/project.cattle.io/v3
 github.com/rancher/types/image