diff --git a/vendor.conf b/vendor.conf index 9b49ca9b..cce82e4d 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 2e66000b6b101dbad981c350fd8216bd90ad562a +github.com/rancher/types f5eff9c0966958f3ea76b316b3a264c00f978f0b diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go index e3652926..d16a6ce1 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go @@ -86,7 +86,6 @@ type ClusterStatus struct { FailedSpec *ClusterSpec `json:"failedSpec,omitempty"` Requested v1.ResourceList `json:"requested,omitempty"` Limits v1.ResourceList `json:"limits,omitempty"` - ClusterName string `json:"clusterName,omitempty"` Version *version.Info `json:"version,omitempty"` AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId"` } 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 959258aa..d393345e 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 @@ -69,7 +69,7 @@ var ( WeaveNode: "weaveworks/weave-kube:2.1.2", WeaveCNI: "weaveworks/weave-npc:2.1.2", PodInfraContainer: "rancher/pause-amd64:3.0", - Ingress: "rancher/nginx-ingress-controller:0.10.2", + Ingress: "rancher/nginx-ingress-controller:0.10.2-rancher1", IngressBackend: "rancher/nginx-ingress-controller-defaultbackend:1.4", } @@ -96,7 +96,7 @@ var ( WeaveNode: "weaveworks/weave-kube:2.1.2", WeaveCNI: "weaveworks/weave-npc:2.1.2", PodInfraContainer: "rancher/pause-amd64:3.0", - Ingress: "rancher/nginx-ingress-controller:0.10.2", + Ingress: "rancher/nginx-ingress-controller:0.10.2-rancher1", IngressBackend: "rancher/nginx-ingress-controller-defaultbackend:1.4", Grafana: "rancher/heapster-grafana-amd64:v4.4.3", Heapster: "rancher/heapster-amd64:v1.5.0", @@ -128,7 +128,7 @@ var ( WeaveNode: "weaveworks/weave-kube:2.1.2", WeaveCNI: "weaveworks/weave-npc:2.1.2", PodInfraContainer: "rancher/pause-amd64:3.1", - Ingress: "rancher/nginx-ingress-controller:0.10.2", + Ingress: "rancher/nginx-ingress-controller:0.10.2-rancher1", IngressBackend: "rancher/nginx-ingress-controller-defaultbackend:1.4", Grafana: "rancher/heapster-grafana-amd64:v4.4.3", Heapster: "rancher/heapster-amd64:v1.5.0",