From 03a47142ed87fa4920dd9cd1f85057c14f9b6950 Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Mon, 12 Mar 2018 11:18:51 -0700 Subject: [PATCH] Updated types dependency --- vendor.conf | 2 +- vendor/github.com/rancher/types/README.md | 4 ++ .../management.cattle.io/v3/authn_types.go | 26 ++++---- .../management.cattle.io/v3/catalog_types.go | 25 +++++++- .../management.cattle.io/v3/cluster_types.go | 6 ++ .../management.cattle.io/v3/k8s_defaults.go | 4 ++ .../management.cattle.io/v3/machine_types.go | 18 +++--- .../management.cattle.io/v3/pipeline_types.go | 5 ++ .../apis/management.cattle.io/v3/rke_types.go | 4 ++ .../v3/zz_generated_deepcopy.go | 59 +++++++++++++++++++ vendor/github.com/rancher/types/vendor.conf | 2 +- 11 files changed, 131 insertions(+), 24 deletions(-) diff --git a/vendor.conf b/vendor.conf index 8bde8d29..f94269f4 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 151aa66e3e99de7e0d195e2d5ca96b1f95544555 -github.com/rancher/types 44ce312ada69eaf4eb851330b960443967885d17 +github.com/rancher/types 6e5110239c1f18204f013a1158511d0f9e3e3e36 diff --git a/vendor/github.com/rancher/types/README.md b/vendor/github.com/rancher/types/README.md index 479e4b44..2a7d0ab4 100644 --- a/vendor/github.com/rancher/types/README.md +++ b/vendor/github.com/rancher/types/README.md @@ -7,6 +7,10 @@ API Types for Rancher 2.0 `make` +## Running the code generator + +Run `go generate` in the root of the project + ## License Copyright (c) 2014-2017 [Rancher Labs, Inc.](http://rancher.com) 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 2a32bd55..a7b19c9c 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 @@ -58,7 +58,7 @@ type Principal struct { LoginName string `json:"loginName,omitempty"` ProfilePicture string `json:"profilePicture,omitempty"` ProfileURL string `json:"profileURL,omitempty"` - Kind string `json:"kind,omitempty"` + PrincipalType string `json:"principalType,omitempty"` Me bool `json:"me,omitempty"` MemberOf bool `json:"memberOf,omitempty"` Provider string `json:"provider,omitempty"` @@ -128,21 +128,21 @@ type ActiveDirectoryConfig struct { DefaultLoginDomain string `json:"defaultLoginDomain,omitempty" norman:"noupdate"` ServiceAccountUsername string `json:"serviceAccountUsername,omitempty" norman:"noupdate"` ServiceAccountPassword string `json:"serviceAccountPassword,omitempty" norman:"noupdate,type=password"` - UserDisabledBitMask int64 `json:"userDisabledBitMask,omitempty" norman:"noupdate"` + UserDisabledBitMask int64 `json:"userDisabledBitMask,omitempty" norman:"default=2,noupdate"` UserSearchBase string `json:"userSearchBase,omitempty" norman:"noupdate"` - UserSearchAttribute string `json:"userSearchAttribute,omitempty" norman:"noupdate"` - UserLoginAttribute string `json:"userLoginAttribute,omitempty" norman:"noupdate"` - UserObjectClass string `json:"userObjectClass,omitempty" norman:"noupdate"` - UserNameAttribute string `json:"userNameAttribute,omitempty" norman:"noupdate"` - UserEnabledAttribute string `json:"userEnabledAttribute,omitempty" norman:"noupdate"` + UserSearchAttribute string `json:"userSearchAttribute,omitempty" norman:"default=sAMAccountName,noupdate"` + UserLoginAttribute string `json:"userLoginAttribute,omitempty" norman:"default=sAMAccountName,noupdate"` + UserObjectClass string `json:"userObjectClass,omitempty" norman:"default=person,noupdate"` + UserNameAttribute string `json:"userNameAttribute,omitempty" norman:"default=name,noupdate"` + UserEnabledAttribute string `json:"userEnabledAttribute,omitempty" norman:"default=userAccountControl,noupdate"` GroupSearchBase string `json:"groupSearchBase,omitempty" norman:"noupdate"` - GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" norman:"noupdate"` - GroupObjectClass string `json:"groupObjectClass,omitempty" norman:"noupdate"` - GroupNameAttribute string `json:"groupNameAttribute,omitempty" norman:"noupdate"` - GroupDNAttribute string `json:"groupDNAttribute,omitempty" norman:"noupdate"` - GroupMemberUserAttribute string `json:"groupMemberUserAttribute,omitempty" norman:"noupdate"` + GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" norman:"default=sAMAccountName,noupdate"` + GroupObjectClass string `json:"groupObjectClass,omitempty" norman:"default=group,noupdate"` + GroupNameAttribute string `json:"groupNameAttribute,omitempty" norman:"default=name,noupdate"` + GroupDNAttribute string `json:"groupDNAttribute,omitempty" norman:"default=distinguishedName,noupdate"` + GroupMemberUserAttribute string `json:"groupMemberUserAttribute,omitempty" norman:"default=distinguishedName,noupdate"` GroupMemberMappingAttribute string `json:"groupMemberMappingAttribute,omitempty" norman:"noupdate"` - ConnectionTimeout int64 `json:"connectionTimeout,omitempty" norman:"noupdate"` + ConnectionTimeout int64 `json:"connectionTimeout,omitempty" norman:"default=5000,noupdate"` } type ActiveDirectoryTestAndApplyInput struct { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/catalog_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/catalog_types.go index ef098346..2276d84a 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/catalog_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/catalog_types.go @@ -1,6 +1,8 @@ package v3 import ( + "github.com/rancher/norman/condition" + "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -17,7 +19,7 @@ type Catalog struct { type CatalogSpec struct { Description string `json:"description"` - URL string `json:"url,omitempty"` + URL string `json:"url,omitempty" norman:"required"` Branch string `json:"branch,omitempty"` CatalogKind string `json:"catalogKind,omitempty"` } @@ -27,6 +29,26 @@ type CatalogStatus struct { Commit string `json:"commit,omitempty"` // helmVersionCommits records hash of each helm template version HelmVersionCommits map[string]VersionCommits `json:"helmVersionCommits,omitempty"` + Conditions []CatalogCondition `json:"conditions,omitempty"` +} + +var ( + CatalogConditionRefreshed condition.Cond = "Refreshed" +) + +type CatalogCondition struct { + // Type of cluster condition. + Type ClusterConditionType `json:"type"` + // Status of the condition, one of True, False, Unknown. + Status v1.ConditionStatus `json:"status"` + // The last time this condition was updated. + LastUpdateTime string `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime string `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason string `json:"reason,omitempty"` + // Human-readable message indicating details about last transition + Message string `json:"message,omitempty"` } type VersionCommits struct { @@ -45,6 +67,7 @@ type Template struct { } type TemplateSpec struct { + DisplayName string `json:"displayName"` CatalogID string `json:"catalogId,omitempty" norman:"type=reference[catalog]"` DefaultTemplateVersionID string `json:"defaultTemplateVersionId,omitempty" norman:"type=reference[templateVersion]"` 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 28f3eab1..b854986f 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 @@ -25,8 +25,12 @@ const ( ClusterConditionconditionDefautlProjectCreated condition.Cond = "DefaultProjectCreated" // ClusterConditionDefaultNamespaceAssigned true when cluster's default namespace has been initially assigned ClusterConditionDefaultNamespaceAssigned condition.Cond = "DefaultNamespaceAssigned" + ClusterConditionAddonDeploy condition.Cond = "AddonDeploy" + ClusterConditionSystemAccountCreated condition.Cond = "SystemAccountCreated" + ClusterConditionAgentDeployed condition.Cond = "AgentDeployed" ClusterDriverImported = "imported" + ClusterDriverLocal = "local" ClusterDriverRKE = "rancherKubernetesEngine" ) @@ -47,6 +51,7 @@ type ClusterSpec struct { DisplayName string `json:"displayName"` Description string `json:"description"` Internal bool `json:"internal" norman:"nocreate,noupdate"` + DesiredAgentImage string `json:"desiredAgentImage" norman:"nocreate,noupdate"` ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" norman:"nocreate,noupdate"` GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"` @@ -66,6 +71,7 @@ type ClusterStatus struct { //Component statuses will represent cluster's components (etcd/controller/scheduler) health // https://kubernetes.io/docs/api-reference/v1.8/#componentstatus-v1-core Driver string `json:"driver"` + AgentImage string `json:"agentImage"` ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"` APIEndpoint string `json:"apiEndpoint,omitempty"` ServiceAccountToken string `json:"serviceAccountToken,omitempty"` 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 b4805a95..36233920 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 @@ -1,5 +1,9 @@ package v3 +const ( + K8sV1_8 = "v1.8.7-rancher1-1" +) + var ( K8sVersionToRKESystemImages = map[string]RKESystemImages{ "v1.8.7-rancher1-1": v187SystemImages, 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 35b5817d..30d6cea1 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 @@ -154,14 +154,16 @@ type NodeSpec struct { Worker bool `json:"worker" norman:"noupdate"` NodeTemplateName string `json:"nodeTemplateName,omitempty" norman:"type=reference[nodeTemplate],noupdate"` - NodePoolName string `json:"nodePoolName" norman:"type=reference[nodePool],nocreate,noupdate"` - CustomConfig *CustomConfig `json:"customConfig"` - Imported bool `json:"imported"` - 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"` + NodePoolName string `json:"nodePoolName" norman:"type=reference[nodePool],nocreate,noupdate"` + CustomConfig *CustomConfig `json:"customConfig"` + Imported bool `json:"imported"` + 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"` } type NodeCommonParams struct { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/pipeline_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/pipeline_types.go index 911723f5..33faac47 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/pipeline_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/pipeline_types.go @@ -207,7 +207,12 @@ type PipelineExecutionLogSpec struct { Message string `json:"message,omitempty"` } +type RunPipelineInput struct { + Branch string `json:"branch,omitempty"` +} + type AuthAppInput struct { + InheritGlobal bool `json:"inheritGlobal,omitempty"` SourceCodeType string `json:"sourceCodeType,omitempty" norman:"type=string,required"` RedirectURL string `json:"redirectUrl,omitempty" norman:"type=string"` TLS bool `json:"tls,omitempty"` diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go index f36e0a81..a21d65ef 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go @@ -15,6 +15,8 @@ type RancherKubernetesEngineConfig struct { SystemImages RKESystemImages `yaml:"system_images" json:"systemImages,omitempty"` // SSH Private Key Path SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` + // SSH Agent Auth enable + SSHAgentAuth bool `yaml:"ssh_agent_auth" json:"sshAgentAuth"` // Authorization mode configuration used in the cluster Authorization AuthzConfig `yaml:"authorization" json:"authorization,omitempty"` // Enable/disable strict docker version checking @@ -127,6 +129,8 @@ type RKEConfigNode struct { User string `yaml:"user" json:"user,omitempty"` // Optional - Docker socket on the node that will be used in tunneling DockerSocket string `yaml:"docker_socket" json:"dockerSocket,omitempty"` + // SSH Agent Auth enable + SSHAgentAuth bool `yaml:"ssh_agent_auth,omitempty" json:"sshAgentAuth,omitempty"` // SSH Private Key SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty"` // SSH Private Key Path 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 5203bba1..27165437 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 @@ -75,6 +75,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*Catalog).DeepCopyInto(out.(*Catalog)) return nil }, InType: reflect.TypeOf(&Catalog{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*CatalogCondition).DeepCopyInto(out.(*CatalogCondition)) + return nil + }, InType: reflect.TypeOf(&CatalogCondition{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*CatalogList).DeepCopyInto(out.(*CatalogList)) return nil @@ -651,6 +655,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*RoleTemplateList).DeepCopyInto(out.(*RoleTemplateList)) return nil }, InType: reflect.TypeOf(&RoleTemplateList{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*RunPipelineInput).DeepCopyInto(out.(*RunPipelineInput)) + return nil + }, InType: reflect.TypeOf(&RunPipelineInput{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*RunScriptConfig).DeepCopyInto(out.(*RunScriptConfig)) return nil @@ -1148,6 +1156,22 @@ func (in *Catalog) DeepCopyObject() runtime.Object { } } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CatalogCondition) DeepCopyInto(out *CatalogCondition) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CatalogCondition. +func (in *CatalogCondition) DeepCopy() *CatalogCondition { + if in == nil { + return nil + } + out := new(CatalogCondition) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CatalogList) DeepCopyInto(out *CatalogList) { *out = *in @@ -1208,6 +1232,11 @@ func (in *CatalogStatus) DeepCopyInto(out *CatalogStatus) { (*out)[key] = *val.DeepCopy() } } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]CatalogCondition, len(*in)) + copy(*out, *in) + } return } @@ -3363,6 +3392,20 @@ func (in *NodeSpec) DeepCopyInto(out *NodeSpec) { } } in.InternalNodeSpec.DeepCopyInto(&out.InternalNodeSpec) + if in.DesiredNodeLabels != nil { + in, out := &in.DesiredNodeLabels, &out.DesiredNodeLabels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.DesiredNodeAnnotations != nil { + in, out := &in.DesiredNodeAnnotations, &out.DesiredNodeAnnotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } return } @@ -5078,6 +5121,22 @@ func (in *RoleTemplateList) DeepCopyObject() runtime.Object { } } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RunPipelineInput) DeepCopyInto(out *RunPipelineInput) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunPipelineInput. +func (in *RunPipelineInput) DeepCopy() *RunPipelineInput { + if in == nil { + return nil + } + out := new(RunPipelineInput) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RunScriptConfig) DeepCopyInto(out *RunScriptConfig) { *out = *in diff --git a/vendor/github.com/rancher/types/vendor.conf b/vendor/github.com/rancher/types/vendor.conf index 35cd2802..67b4fbb9 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 94b274ab753743ef3e8a7cca7bbf157d877d2789 +github.com/rancher/norman a978cad0e8751968fec4371f9ab6df6d446a389b