diff --git a/vendor.conf b/vendor.conf index f3f62f9b..918335e3 100644 --- a/vendor.conf +++ b/vendor.conf @@ -10,7 +10,7 @@ github.com/docker/distribution 3800056b8832cf6075e78b282ac010131d8687b github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d github.com/docker/go-units 0dadbb0345b35ec7ef35e228dabb8de89a65bf52 golang.org/x/net 186fd3fc8194a5e9980a82230d69c1ff7134229f -github.com/rancher/types a71860ee9f4809a57d2cc7dadf2d74b9b8f2d736 +github.com/rancher/types efe8c45673d9e2132cd78cb46e61340b5ffc4421 github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf github.com/gogo/protobuf 117892bf1866fbaa2318c03e50e40564c8845457 github.com/opencontainers/image-spec 7c889fafd04a893f5c5f50b7ab9963d5d64e5242 diff --git a/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/types.go b/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/types.go index fadd1737..e13e8d32 100644 --- a/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/types.go +++ b/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/types.go @@ -31,7 +31,7 @@ type Cluster struct { Spec ClusterSpec `json:"spec"` // Most recent observed status of the cluster. More info: // https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status - Status *ClusterStatus `json:"status"` + Status ClusterStatus `json:"status"` } type ClusterSpec struct { @@ -46,13 +46,13 @@ type ClusterStatus struct { Conditions []ClusterCondition `json:"conditions,omitempty"` //Component statuses will represent cluster's components (etcd/controller/scheduler) health // https://kubernetes.io/docs/api-reference/v1.8/#componentstatus-v1-core - ComponentStatuses []ClusterComponentStatus - APIEndpoint string `json:"apiEndpoint,omitempty"` - ServiceAccountToken string `json:"serviceAccountToken,omitempty"` - CACert string `json:"caCert,omitempty"` - Capacity v1.ResourceList `json:"capacity,omitempty"` - Allocatable v1.ResourceList `json:"allocatable,omitempty"` - AppliedSpec ClusterSpec `json:"clusterSpec,omitempty"` + ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"` + APIEndpoint string `json:"apiEndpoint,omitempty"` + ServiceAccountToken string `json:"serviceAccountToken,omitempty"` + CACert string `json:"caCert,omitempty"` + Capacity v1.ResourceList `json:"capacity,omitempty"` + Allocatable v1.ResourceList `json:"allocatable,omitempty"` + AppliedSpec ClusterSpec `json:"appliedSpec,omitempty"` } type ClusterComponentStatus struct { @@ -114,6 +114,8 @@ type RancherKubernetesEngineConfig struct { Network NetworkConfig `yaml:"network" json:"network,omitempty"` // Authentication configuration used in the cluster (default: x509) Authentication AuthConfig `yaml:"auth" json:"auth,omitempty"` + // YAML manifest for user provided addons to be deployed on the cluster + Addons string `yaml:"addons" json:"addons,omitempty"` } type RKEConfigHost struct { @@ -135,9 +137,9 @@ type RKEConfigServices struct { // Etcd Service Etcd ETCDService `yaml:"etcd" json:"etcd,omitempty"` // KubeAPI Service - KubeAPI KubeAPIService `yaml:"kube-api" json:"kube-api,omitempty"` + KubeAPI KubeAPIService `yaml:"kube-api" json:"kubeApi,omitempty"` // KubeController Service - KubeController KubeControllerService `yaml:"kube-controller" json:"kube-controller,omitempty"` + KubeController KubeControllerService `yaml:"kube-controller" json:"kubeController,omitempty"` // Scheduler Service Scheduler SchedulerService `yaml:"scheduler" json:"scheduler,omitempty"` // Kubelet Service diff --git a/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go b/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go index 77123c0c..78419ae5 100644 --- a/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go +++ b/vendor/github.com/rancher/types/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go @@ -73,15 +73,7 @@ func (in *Cluster) DeepCopyInto(out *Cluster) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - if in.Status != nil { - in, out := &in.Status, &out.Status - if *in == nil { - *out = nil - } else { - *out = new(ClusterStatus) - (*in).DeepCopyInto(*out) - } - } + in.Status.DeepCopyInto(&out.Status) return } diff --git a/vendor/github.com/rancher/types/vendor.conf b/vendor/github.com/rancher/types/vendor.conf index c4b7dfbf..15ea699f 100644 --- a/vendor/github.com/rancher/types/vendor.conf +++ b/vendor/github.com/rancher/types/vendor.conf @@ -3,4 +3,4 @@ github.com/rancher/types k8s.io/kubernetes v1.8.3 transitive=true,staging=true bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git -github.com/rancher/norman cad01ba487d6c071911c619babc45ae80c252229 +github.com/rancher/norman 80024df69414f7cce0847ea72b0557f14edbc852