diff --git a/vendor.conf b/vendor.conf index 3b8192d4..119a4413 100644 --- a/vendor.conf +++ b/vendor.conf @@ -24,4 +24,4 @@ github.com/coreos/go-semver e214231b295a8ea9479f11b70b35d5acf3556d9 github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869dc github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d -github.com/rancher/types 8035c0acac8c81a00cdd9e50cf0fa2b4c428582f +github.com/rancher/types 9edf6680b49cd3c02ea2b4681e81e6eff593014a diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go index b9b15ad0..6adb9398 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go @@ -8,7 +8,7 @@ const ( var ( m = image.Mirror - ToolsImage = m("rancher/rke-tools:v0.1.2") + ToolsImage = m("rancher/rke-tools:v0.1.3") // K8sVersionToRKESystemImages - images map for 2.0 K8sVersionToRKESystemImages = map[string]RKESystemImages{ diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go index f248c332..2b3d6d82 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go @@ -183,7 +183,6 @@ type NodeSpec struct { Description string `json:"description,omitempty"` DisplayName string `json:"displayName"` RequestedHostname string `json:"requestedHostname,omitempty" norman:"type=dnsLabel,nullable,noupdate,required"` - ClusterName string `json:"clusterName,omitempty" norman:"type=reference[cluster],noupdate,required"` InternalNodeSpec v1.NodeSpec `json:"internalNodeSpec"` DesiredNodeLabels map[string]string `json:"desiredNodeLabels,omitempty"` DesiredNodeAnnotations map[string]string `json:"desiredNodeAnnotations,omitempty"` diff --git a/vendor/github.com/rancher/types/vendor.conf b/vendor/github.com/rancher/types/vendor.conf index 0f0e9994..2166d4e1 100644 --- a/vendor/github.com/rancher/types/vendor.conf +++ b/vendor/github.com/rancher/types/vendor.conf @@ -5,4 +5,4 @@ k8s.io/kubernetes v1.8.3 bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5 -github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d +github.com/rancher/norman 0611d5f7a126637abad8f0e5734cbc6562ed3922