diff --git a/vendor.conf b/vendor.conf index b6163738..6e7c1c31 100644 --- a/vendor.conf +++ b/vendor.conf @@ -25,4 +25,4 @@ github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869d github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b175 github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d -github.com/rancher/types 79f22d2e4d4d649ba9ad9ba4da624c60872b4f3e +github.com/rancher/types 0189352f3ba9ae7b79adeda739aca3f768af1f48 diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go index c70df442..c8349576 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go @@ -84,7 +84,7 @@ type AuthConfig struct { metav1.ObjectMeta `json:"metadata,omitempty"` Type string `json:"type" norman:"noupdate"` - Enabled bool `json:"enabled,omitempty" norman:"noupdate"` + Enabled bool `json:"enabled,omitempty"` AccessMode string `json:"accessMode,omitempty" norman:"required,notnullable,type=enum,options=required|restricted|unrestricted"` AllowedPrincipalIDs []string `json:"allowedPrincipalIds,omitempty" norman:"type=array[reference[principal]]"` } @@ -151,3 +151,21 @@ type ActiveDirectoryTestAndApplyInput struct { Password string `json:"password"` Enabled bool `json:"enabled,omitempty"` } + +type AzureADConfig struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + AuthConfig `json:",inline" mapstructure:",squash"` + + TenantID string `json:"tenantId,omitempty" norman:"required"` + ClientID string `json:"clientId,omitempty" norman:"required"` + Domain string `json:"domain,omitempty" norman:"required"` + ClientSecret string `json:"clientSecret,omitempty"` +} + +type AzureADTestAndApplyInput struct { + AzureADConfig AzureADConfig `json:"azureAdConfig, omitempty"` + Username string `json:"username"` + Password string `json:"password"` + Enabled bool `json:"enabled,omitempty"` +} diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go index 87621ab1..61a0a5fe 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go @@ -73,14 +73,18 @@ type RoleTemplate struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - DisplayName string `json:"displayName,omitempty" norman:"required"` - Description string `json:"description"` - Rules []rbacv1.PolicyRule `json:"rules,omitempty"` - Builtin bool `json:"builtin" norman:"nocreate,noupdate"` - External bool `json:"external"` - Hidden bool `json:"hidden"` - Context string `json:"context" norman:"type=string,options=project|cluster"` - RoleTemplateNames []string `json:"roleTemplateNames,omitempty" norman:"type=array[reference[roleTemplate]]"` + DisplayName string `json:"displayName,omitempty" norman:"required"` + Description string `json:"description"` + Rules []rbacv1.PolicyRule `json:"rules,omitempty"` + Builtin bool `json:"builtin" norman:"nocreate,noupdate"` + External bool `json:"external"` + Hidden bool `json:"hidden"` + // Enabled is a bool pointer so that it will be backwards compatible with previous versions of rancher. This field + // did not always exist. If it were a normal bool, old resources would default to false. With a pointer we can + // interpret the absence (nil) of the field to mean true. + Enabled *bool `json:"enabled,omitempty" norman:"type=boolean,default=true"` + Context string `json:"context" norman:"type=string,options=project|cluster"` + RoleTemplateNames []string `json:"roleTemplateNames,omitempty" norman:"type=array[reference[roleTemplate]]"` } type PodSecurityPolicyTemplate 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 e46ebfde..9c9594c3 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 @@ -3,22 +3,21 @@ package v3 import "github.com/rancher/types/image" const ( - DefaultK8s = "v1.10.1-rancher1" + DefaultK8s = "v1.10.1-rancher2-1" ) var ( - m = image.Mirror - ToolsImage = m("rancher/rke-tools:v0.1.6") + m = image.Mirror // 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("rancher/hyperkube:v1.8.10-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), @@ -40,10 +39,10 @@ var ( "v1.8.11-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.0.17"), Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), @@ -62,16 +61,16 @@ var ( 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("rancher/hyperkube:v1.9.7-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), + "v1.8.11-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.0.17"), + Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), Flannel: m("quay.io/coreos/flannel:v0.9.1"), FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), @@ -90,10 +89,60 @@ var ( "v1.9.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + 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-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.9.7-rancher1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + 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-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.9.7-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2-1"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), @@ -115,10 +164,10 @@ var ( "v1.10.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.0-rancher1"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), @@ -140,10 +189,35 @@ var ( "v1.10.1-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.1-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + 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-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.10.1-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.10.1-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), @@ -200,7 +274,7 @@ var ( 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, + Busybox: m("busybox"), }, } ) 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 0f7f1714..b90d4ea3 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 @@ -63,8 +63,9 @@ type ProjectLoggingSpec struct { } type ClusterLoggingStatus struct { - Conditions []LoggingCondition `json:"conditions,omitempty"` - AppliedSpec ClusterLoggingSpec `json:"appliedSpec,omitempty"` + Conditions []LoggingCondition `json:"conditions,omitempty"` + AppliedSpec ClusterLoggingSpec `json:"appliedSpec,omitempty"` + FailedSpec *ClusterLoggingSpec `json:"failedSpec,omitempty"` } type ProjectLoggingStatus struct { @@ -98,12 +99,14 @@ type ElasticsearchConfig struct { DateFormat string `json:"dateFormat,omitempty" norman:"required,type=enum,options=YYYY-MM-DD|YYYY-MM|YYYY,default=YYYY-MM-DD"` AuthUserName string `json:"authUsername,omitempty"` //secret AuthPassword string `json:"authPassword,omitempty"` //secret + SSLVerify bool `json:"sslVerify,omitempty" norman:"required,default=true"` } type SplunkConfig struct { - Endpoint string `json:"endpoint,omitempty" norman:"required"` - Source string `json:"source,omitempty"` - Token string `json:"token,omitempty" norman:"required"` //secret + Endpoint string `json:"endpoint,omitempty" norman:"required"` + Source string `json:"source,omitempty"` + Token string `json:"token,omitempty" norman:"required"` //secret + SSLVerify bool `json:"sslVerify,omitempty" norman:"required,default=true"` } type EmbeddedConfig 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 eb7501a0..f6d911d5 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 @@ -76,6 +76,14 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*AuthzConfig).DeepCopyInto(out.(*AuthzConfig)) return nil }, InType: reflect.TypeOf(&AuthzConfig{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*AzureADConfig).DeepCopyInto(out.(*AzureADConfig)) + return nil + }, InType: reflect.TypeOf(&AzureADConfig{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*AzureADTestAndApplyInput).DeepCopyInto(out.(*AzureADTestAndApplyInput)) + return nil + }, InType: reflect.TypeOf(&AzureADTestAndApplyInput{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*AzureCloudProvider).DeepCopyInto(out.(*AzureCloudProvider)) return nil @@ -1263,6 +1271,51 @@ func (in *AuthzConfig) DeepCopy() *AuthzConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AzureADConfig) DeepCopyInto(out *AzureADConfig) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.AuthConfig.DeepCopyInto(&out.AuthConfig) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureADConfig. +func (in *AzureADConfig) DeepCopy() *AzureADConfig { + if in == nil { + return nil + } + out := new(AzureADConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *AzureADConfig) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AzureADTestAndApplyInput) DeepCopyInto(out *AzureADTestAndApplyInput) { + *out = *in + in.AzureADConfig.DeepCopyInto(&out.AzureADConfig) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureADTestAndApplyInput. +func (in *AzureADTestAndApplyInput) DeepCopy() *AzureADTestAndApplyInput { + if in == nil { + return nil + } + out := new(AzureADTestAndApplyInput) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AzureCloudProvider) DeepCopyInto(out *AzureCloudProvider) { *out = *in @@ -2007,6 +2060,15 @@ func (in *ClusterLoggingStatus) DeepCopyInto(out *ClusterLoggingStatus) { copy(*out, *in) } in.AppliedSpec.DeepCopyInto(&out.AppliedSpec) + if in.FailedSpec != nil { + in, out := &in.FailedSpec, &out.FailedSpec + if *in == nil { + *out = nil + } else { + *out = new(ClusterLoggingSpec) + (*in).DeepCopyInto(*out) + } + } return } @@ -5996,6 +6058,15 @@ func (in *RoleTemplate) DeepCopyInto(out *RoleTemplate) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.Enabled != nil { + in, out := &in.Enabled, &out.Enabled + if *in == nil { + *out = nil + } else { + *out = new(bool) + **out = **in + } + } if in.RoleTemplateNames != nil { in, out := &in.RoleTemplateNames, &out.RoleTemplateNames *out = make([]string, len(*in))