diff --git a/vendor.conf b/vendor.conf index 119a4413..393b1a0c 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 9edf6680b49cd3c02ea2b4681e81e6eff593014a +github.com/rancher/types 33dd3240e81b7c6087db2c998679f5cb307d4f78 diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go index 4a34fde0..0b7bfa67 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go @@ -134,7 +134,7 @@ type Notification struct { type SMTPConfig struct { Host string `json:"host,omitempty" norman:"required,type=dnsLabel"` - Port int `json:"port,omitempty" norman:"required,min=1,max=65535,default=465"` + Port int `json:"port,omitempty" norman:"required,min=1,max=65535,default=587"` Username string `json:"username,omitempty"` Password string `json:"password,omitempty"` Sender string `json:"sender,omitempty" norman:"required"` 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 daf9c562..84f89cb2 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 @@ -142,13 +142,13 @@ type GoogleKubernetesEngineConfig struct { // Enable alpha feature EnableAlphaFeature bool `json:"enableAlphaFeature,omitempty"` // Configuration for the HTTP (L7) load balancing controller addon - HTTPLoadBalancing bool `json:"httpLoadBalancing,omitempty"` + DisableHTTPLoadBalancing bool `json:"disableHttpLoadBalancing,omitempty"` // Configuration for the horizontal pod autoscaling feature, which increases or decreases the number of replica pods a replication controller has based on the resource usage of the existing pods - HorizontalPodAutoscaling bool `json:"horizontalPodAutoscaling,omitempty"` + DisableHorizontalPodAutoscaling bool `json:"disableHorizontalPodAutoscaling,omitempty"` // Configuration for the Kubernetes Dashboard - KubernetesDashboard bool `json:"kubernetesDashboard,omitempty"` + EnableKubernetesDashboard bool `json:"enableKubernetesDashboard,omitempty"` // Configuration for NetworkPolicy - NetworkPolicyConfig bool `json:"networkPolicyConfig,omitempty"` + DisableNetworkPolicyConfig bool `json:"disableNetworkPolicyConfig,omitempty"` // The list of Google Compute Engine locations in which the cluster's nodes should be located Locations []string `json:"locations,omitempty"` // Image Type @@ -158,7 +158,7 @@ type GoogleKubernetesEngineConfig struct { // Sub Network SubNetwork string `json:"subNetwork,omitempty"` // Configuration for LegacyAbac - LegacyAbac bool `json:"legacyAbac,omitempty"` + EnableLegacyAbac bool `json:"enableLegacyAbac,omitempty"` } type AzureKubernetesServiceConfig struct { 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 6adb9398..54bb2d5d 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,13 +8,13 @@ const ( var ( m = image.Mirror - ToolsImage = m("rancher/rke-tools:v0.1.3") + ToolsImage = m("rancher/rke-tools:v0.1.4") // K8sVersionToRKESystemImages - images map for 2.0 K8sVersionToRKESystemImages = map[string]RKESystemImages{ "v1.8.10-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.0.17"), - Kubernetes: m("gcr.io/google_containers/hyperkube:v1.8.10"), + Kubernetes: m("rancher/hyperkube:v1.8.10-rancher1"), Alpine: ToolsImage, NginxProxy: ToolsImage, CertDownloader: ToolsImage, @@ -34,12 +34,12 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, "v1.8.11-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.0.17"), - Kubernetes: m("gcr.io/google_containers/hyperkube:v1.8.11"), + Kubernetes: m("rancher/hyperkube:v1.8.11-rancher1"), Alpine: ToolsImage, NginxProxy: ToolsImage, CertDownloader: ToolsImage, @@ -59,12 +59,12 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, "v1.9.7-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("gcr.io/google_containers/hyperkube:v1.9.7"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher1"), Alpine: ToolsImage, NginxProxy: ToolsImage, CertDownloader: ToolsImage, @@ -84,12 +84,12 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, "v1.9.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("gcr.io/google_containers/hyperkube:v1.9.5"), + Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), Alpine: ToolsImage, NginxProxy: ToolsImage, CertDownloader: ToolsImage, @@ -109,12 +109,12 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, "v1.10.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("gcr.io/google_containers/hyperkube:v1.10.0"), + Kubernetes: m("rancher/hyperkube:v1.10.0-rancher1"), Alpine: ToolsImage, NginxProxy: ToolsImage, CertDownloader: ToolsImage, @@ -134,12 +134,12 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), - Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, "v1.10.1-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("gcr.io/google_containers/hyperkube:v1.10.1"), + Kubernetes: m("rancher/hyperkube:v1.10.1-rancher1"), Alpine: ToolsImage, NginxProxy: ToolsImage, CertDownloader: ToolsImage, @@ -159,7 +159,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), - Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, } @@ -193,9 +193,9 @@ var ( PluginsDocker: m("plugins/docker"), }, LoggingSystemImages: LoggingSystemImages{ - Fluentd: m("rancher/fluentd:v0.1.6"), + Fluentd: m("rancher/fluentd:v0.1.7"), FluentdHelper: m("rancher/fluentd-helper:v0.1.2"), - LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.2"), + LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"), Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"), Kibana: m("kibana:5.6.4"), Busybox: ToolsImage, diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go index 28ed1238..0f7f1714 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go @@ -19,7 +19,7 @@ type ClusterLogging struct { Spec ClusterLoggingSpec `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 LoggingStatus `json:"status"` + Status ClusterLoggingStatus `json:"status"` } type ProjectLogging struct { @@ -34,7 +34,7 @@ type ProjectLogging struct { Spec ProjectLoggingSpec `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 LoggingStatus `json:"status"` + Status ProjectLoggingStatus `json:"status"` } type LoggingCommonSpec struct { @@ -62,13 +62,19 @@ type ProjectLoggingSpec struct { ProjectName string `json:"projectName" norman:"type=reference[project]"` } -type LoggingStatus struct { - Conditions []LoggingCondition `json:"conditions,omitempty"` +type ClusterLoggingStatus struct { + Conditions []LoggingCondition `json:"conditions,omitempty"` + AppliedSpec ClusterLoggingSpec `json:"appliedSpec,omitempty"` +} + +type ProjectLoggingStatus struct { + Conditions []LoggingCondition `json:"conditions,omitempty"` + AppliedSpec ProjectLoggingSpec `json:"appliedSpec,omitempty"` } var ( - ClusterLoggingConditionInitialized condition.Cond = "Initialized" - ClusterLoggingConditionProvisioned condition.Cond = "Provisioned" + LoggingConditionProvisioned condition.Cond = "Provisioned" + LoggingConditionUpdated condition.Cond = "Updated" ) type LoggingCondition struct { @@ -105,10 +111,10 @@ type EmbeddedConfig struct { DateFormat string `json:"dateFormat,omitempty" norman:"required,type=enum,options=YYYY-MM-DD|YYYY-MM|YYYY,default=YYYY-MM-DD"` ElasticsearchEndpoint string `json:"elasticsearchEndpoint,omitempty" norman:"nocreate"` KibanaEndpoint string `json:"kibanaEndpoint,omitempty" norman:"nocreate"` - RequestsMemery int `json:"requestsMemory,omitempty" norman:"default=500,min=500"` - RequestsCPU int `json:"requestsCpu,omitempty" norman:"default=1000,min=1000"` - LimitsMemery int `json:"limitsMemory,omitempty"` - LimitsCPU int `json:"limitsCpu,omitempty"` + RequestsMemery int `json:"requestsMemory,omitempty" norman:"default=4096,min=512"` + RequestsCPU int `json:"requestsCpu,omitempty" norman:"default=2000,min=1000"` + LimitsMemery int `json:"limitsMemory,omitempty" norman:"default=4096,min=512"` + LimitsCPU int `json:"limitsCpu,omitempty" norman:"default=2000,min=1000"` } type KafkaConfig struct { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 0db6ddc0..72bd915c 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -184,6 +184,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*ClusterLoggingSpec).DeepCopyInto(out.(*ClusterLoggingSpec)) return nil }, InType: reflect.TypeOf(&ClusterLoggingSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*ClusterLoggingStatus).DeepCopyInto(out.(*ClusterLoggingStatus)) + return nil + }, InType: reflect.TypeOf(&ClusterLoggingStatus{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*ClusterPipeline).DeepCopyInto(out.(*ClusterPipeline)) return nil @@ -432,10 +436,6 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*LoggingCondition).DeepCopyInto(out.(*LoggingCondition)) return nil }, InType: reflect.TypeOf(&LoggingCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LoggingStatus).DeepCopyInto(out.(*LoggingStatus)) - return nil - }, InType: reflect.TypeOf(&LoggingStatus{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*LoggingSystemImages).DeepCopyInto(out.(*LoggingSystemImages)) return nil @@ -676,6 +676,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*ProjectLoggingSpec).DeepCopyInto(out.(*ProjectLoggingSpec)) return nil }, InType: reflect.TypeOf(&ProjectLoggingSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*ProjectLoggingStatus).DeepCopyInto(out.(*ProjectLoggingStatus)) + return nil + }, InType: reflect.TypeOf(&ProjectLoggingStatus{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*ProjectNetworkPolicy).DeepCopyInto(out.(*ProjectNetworkPolicy)) return nil @@ -1973,6 +1977,28 @@ func (in *ClusterLoggingSpec) DeepCopy() *ClusterLoggingSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterLoggingStatus) DeepCopyInto(out *ClusterLoggingStatus) { + *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]LoggingCondition, len(*in)) + copy(*out, *in) + } + in.AppliedSpec.DeepCopyInto(&out.AppliedSpec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterLoggingStatus. +func (in *ClusterLoggingStatus) DeepCopy() *ClusterLoggingStatus { + if in == nil { + return nil + } + out := new(ClusterLoggingStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterPipeline) DeepCopyInto(out *ClusterPipeline) { *out = *in @@ -3642,27 +3668,6 @@ func (in *LoggingCondition) DeepCopy() *LoggingCondition { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *LoggingStatus) DeepCopyInto(out *LoggingStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]LoggingCondition, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LoggingStatus. -func (in *LoggingStatus) DeepCopy() *LoggingStatus { - if in == nil { - return nil - } - out := new(LoggingStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LoggingSystemImages) DeepCopyInto(out *LoggingSystemImages) { *out = *in @@ -5452,6 +5457,28 @@ func (in *ProjectLoggingSpec) DeepCopy() *ProjectLoggingSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProjectLoggingStatus) DeepCopyInto(out *ProjectLoggingStatus) { + *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]LoggingCondition, len(*in)) + copy(*out, *in) + } + in.AppliedSpec.DeepCopyInto(&out.AppliedSpec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectLoggingStatus. +func (in *ProjectLoggingStatus) DeepCopy() *ProjectLoggingStatus { + if in == nil { + return nil + } + out := new(ProjectLoggingStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ProjectNetworkPolicy) DeepCopyInto(out *ProjectNetworkPolicy) { *out = *in