diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index dfacbac5..bcf612a7 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -115,6 +115,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*ClusterStatus).DeepCopyInto(out.(*ClusterStatus)) return nil }, InType: reflect.TypeOf(&ClusterStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*CustomConfig).DeepCopyInto(out.(*CustomConfig)) + return nil + }, InType: reflect.TypeOf(&CustomConfig{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*DynamicSchema).DeepCopyInto(out.(*DynamicSchema)) return nil @@ -187,6 +191,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*GroupMemberList).DeepCopyInto(out.(*GroupMemberList)) return nil }, InType: reflect.TypeOf(&GroupMemberList{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*ImportedConfig).DeepCopyInto(out.(*ImportedConfig)) + return nil + }, InType: reflect.TypeOf(&ImportedConfig{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*K8sServerConfig).DeepCopyInto(out.(*K8sServerConfig)) return nil @@ -1008,6 +1016,15 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.ImportedConfig != nil { + in, out := &in.ImportedConfig, &out.ImportedConfig + if *in == nil { + *out = nil + } else { + *out = new(ImportedConfig) + **out = **in + } + } if in.EmbeddedConfig != nil { in, out := &in.EmbeddedConfig, &out.EmbeddedConfig if *in == nil { @@ -1114,6 +1131,22 @@ func (in *ClusterStatus) DeepCopy() *ClusterStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CustomConfig) DeepCopyInto(out *CustomConfig) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CustomConfig. +func (in *CustomConfig) DeepCopy() *CustomConfig { + if in == nil { + return nil + } + out := new(CustomConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DynamicSchema) DeepCopyInto(out *DynamicSchema) { *out = *in @@ -1631,6 +1664,22 @@ func (in *GroupMemberList) DeepCopyObject() runtime.Object { } } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ImportedConfig) DeepCopyInto(out *ImportedConfig) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ImportedConfig. +func (in *ImportedConfig) DeepCopy() *ImportedConfig { + if in == nil { + return nil + } + out := new(ImportedConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *K8sServerConfig) DeepCopyInto(out *K8sServerConfig) { *out = *in @@ -2131,6 +2180,15 @@ func (in *MachineList) DeepCopyObject() runtime.Object { func (in *MachineSpec) DeepCopyInto(out *MachineSpec) { *out = *in in.NodeSpec.DeepCopyInto(&out.NodeSpec) + if in.CustomConfig != nil { + in, out := &in.CustomConfig, &out.CustomConfig + if *in == nil { + *out = nil + } else { + *out = new(CustomConfig) + **out = **in + } + } if in.Role != nil { in, out := &in.Role, &out.Role *out = make([]string, len(*in)) diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index fff3b729..881a0fc6 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -20,10 +20,9 @@ const ( ClusterFieldDefaultPodSecurityPolicyTemplateId = "defaultPodSecurityPolicyTemplateId" ClusterFieldDescription = "description" ClusterFieldDriver = "driver" - ClusterFieldEmbedded = "embedded" ClusterFieldEmbeddedConfig = "embeddedConfig" ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" - ClusterFieldImported = "imported" + ClusterFieldImportedConfig = "importedConfig" ClusterFieldInternal = "internal" ClusterFieldLabels = "labels" ClusterFieldLimits = "limits" @@ -55,10 +54,9 @@ type Cluster struct { DefaultPodSecurityPolicyTemplateId string `json:"defaultPodSecurityPolicyTemplateId,omitempty"` Description string `json:"description,omitempty"` Driver string `json:"driver,omitempty"` - Embedded *bool `json:"embedded,omitempty"` EmbeddedConfig *K8sServerConfig `json:"embeddedConfig,omitempty"` GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` - Imported *bool `json:"imported,omitempty"` + ImportedConfig *ImportedConfig `json:"importedConfig,omitempty"` Internal *bool `json:"internal,omitempty"` Labels map[string]string `json:"labels,omitempty"` Limits map[string]string `json:"limits,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go index 188eced0..7332db83 100644 --- a/client/management/v3/zz_generated_cluster_spec.go +++ b/client/management/v3/zz_generated_cluster_spec.go @@ -7,10 +7,9 @@ const ( ClusterSpecFieldDefaultPodSecurityPolicyTemplateId = "defaultPodSecurityPolicyTemplateId" ClusterSpecFieldDescription = "description" ClusterSpecFieldDisplayName = "displayName" - ClusterSpecFieldEmbedded = "embedded" ClusterSpecFieldEmbeddedConfig = "embeddedConfig" ClusterSpecFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" - ClusterSpecFieldImported = "imported" + ClusterSpecFieldImportedConfig = "importedConfig" ClusterSpecFieldInternal = "internal" ClusterSpecFieldNodes = "nodes" ClusterSpecFieldRancherKubernetesEngineConfig = "rancherKubernetesEngineConfig" @@ -22,10 +21,9 @@ type ClusterSpec struct { DefaultPodSecurityPolicyTemplateId string `json:"defaultPodSecurityPolicyTemplateId,omitempty"` Description string `json:"description,omitempty"` DisplayName string `json:"displayName,omitempty"` - Embedded *bool `json:"embedded,omitempty"` EmbeddedConfig *K8sServerConfig `json:"embeddedConfig,omitempty"` GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` - Imported *bool `json:"imported,omitempty"` + ImportedConfig *ImportedConfig `json:"importedConfig,omitempty"` Internal *bool `json:"internal,omitempty"` Nodes []MachineConfig `json:"nodes,omitempty"` RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"` diff --git a/client/management/v3/zz_generated_custom_config.go b/client/management/v3/zz_generated_custom_config.go new file mode 100644 index 00000000..685537ff --- /dev/null +++ b/client/management/v3/zz_generated_custom_config.go @@ -0,0 +1,18 @@ +package client + +const ( + CustomConfigType = "customConfig" + CustomConfigFieldAddress = "address" + CustomConfigFieldDockerSocket = "dockerSocket" + CustomConfigFieldInternalAddress = "internalAddress" + CustomConfigFieldSSHKey = "sshKey" + CustomConfigFieldUser = "user" +) + +type CustomConfig struct { + Address string `json:"address,omitempty"` + DockerSocket string `json:"dockerSocket,omitempty"` + InternalAddress string `json:"internalAddress,omitempty"` + SSHKey string `json:"sshKey,omitempty"` + User string `json:"user,omitempty"` +} diff --git a/client/management/v3/zz_generated_imported_config.go b/client/management/v3/zz_generated_imported_config.go new file mode 100644 index 00000000..d141d0cd --- /dev/null +++ b/client/management/v3/zz_generated_imported_config.go @@ -0,0 +1,10 @@ +package client + +const ( + ImportedConfigType = "importedConfig" + ImportedConfigFieldKubeConfig = "kubeConfig" +) + +type ImportedConfig struct { + KubeConfig string `json:"kubeConfig,omitempty"` +} diff --git a/client/management/v3/zz_generated_machine.go b/client/management/v3/zz_generated_machine.go index d6d9f8ab..e92f744b 100644 --- a/client/management/v3/zz_generated_machine.go +++ b/client/management/v3/zz_generated_machine.go @@ -13,6 +13,7 @@ const ( MachineFieldConditions = "conditions" MachineFieldCreated = "created" MachineFieldCreatorID = "creatorId" + MachineFieldCustomConfig = "customConfig" MachineFieldDescription = "description" MachineFieldHostname = "hostname" MachineFieldIPAddress = "ipAddress" @@ -54,6 +55,7 @@ type Machine struct { Conditions []MachineCondition `json:"conditions,omitempty"` Created string `json:"created,omitempty"` CreatorID string `json:"creatorId,omitempty"` + CustomConfig *CustomConfig `json:"customConfig,omitempty"` Description string `json:"description,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` diff --git a/client/management/v3/zz_generated_machine_config.go b/client/management/v3/zz_generated_machine_config.go index 81f4fac7..dbd26dd0 100644 --- a/client/management/v3/zz_generated_machine_config.go +++ b/client/management/v3/zz_generated_machine_config.go @@ -3,6 +3,7 @@ package client const ( MachineConfigType = "machineConfig" MachineConfigFieldAnnotations = "annotations" + MachineConfigFieldCustomConfig = "customConfig" MachineConfigFieldDescription = "description" MachineConfigFieldDisplayName = "displayName" MachineConfigFieldLabels = "labels" @@ -15,6 +16,7 @@ const ( type MachineConfig struct { Annotations map[string]string `json:"annotations,omitempty"` + CustomConfig *CustomConfig `json:"customConfig,omitempty"` Description string `json:"description,omitempty"` DisplayName string `json:"displayName,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_machine_spec.go b/client/management/v3/zz_generated_machine_spec.go index c1ce1e03..dc8d5398 100644 --- a/client/management/v3/zz_generated_machine_spec.go +++ b/client/management/v3/zz_generated_machine_spec.go @@ -3,6 +3,7 @@ package client const ( MachineSpecType = "machineSpec" MachineSpecFieldClusterId = "clusterId" + MachineSpecFieldCustomConfig = "customConfig" MachineSpecFieldDescription = "description" MachineSpecFieldDisplayName = "displayName" MachineSpecFieldMachineTemplateId = "machineTemplateId" @@ -16,15 +17,16 @@ const ( ) type MachineSpec struct { - ClusterId string `json:"clusterId,omitempty"` - Description string `json:"description,omitempty"` - DisplayName string `json:"displayName,omitempty"` - MachineTemplateId string `json:"machineTemplateId,omitempty"` - PodCidr string `json:"podCidr,omitempty"` - ProviderId string `json:"providerId,omitempty"` - RequestedHostname string `json:"requestedHostname,omitempty"` - Role []string `json:"role,omitempty"` - Taints []Taint `json:"taints,omitempty"` - Unschedulable *bool `json:"unschedulable,omitempty"` - UseInternalIPAddress *bool `json:"useInternalIpAddress,omitempty"` + ClusterId string `json:"clusterId,omitempty"` + CustomConfig *CustomConfig `json:"customConfig,omitempty"` + Description string `json:"description,omitempty"` + DisplayName string `json:"displayName,omitempty"` + MachineTemplateId string `json:"machineTemplateId,omitempty"` + PodCidr string `json:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty"` + RequestedHostname string `json:"requestedHostname,omitempty"` + Role []string `json:"role,omitempty"` + Taints []Taint `json:"taints,omitempty"` + Unschedulable *bool `json:"unschedulable,omitempty"` + UseInternalIPAddress *bool `json:"useInternalIpAddress,omitempty"` }