diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 51949153..9f188c26 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -1537,6 +1537,7 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { *out = new(bool) **out = **in } + out.LocalClusterAuthEndpoint = in.LocalClusterAuthEndpoint return } @@ -3578,6 +3579,22 @@ func (in *LoadBalancerOpenstackOpts) DeepCopy() *LoadBalancerOpenstackOpts { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LocalClusterAuthEndpoint) DeepCopyInto(out *LocalClusterAuthEndpoint) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LocalClusterAuthEndpoint. +func (in *LocalClusterAuthEndpoint) DeepCopy() *LocalClusterAuthEndpoint { + if in == nil { + return nil + } + out := new(LocalClusterAuthEndpoint) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LocalConfig) DeepCopyInto(out *LocalConfig) { *out = *in diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index 8408f569..c3ca5fa3 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -10,7 +10,6 @@ const ( ClusterFieldAgentImage = "agentImage" ClusterFieldAllocatable = "allocatable" ClusterFieldAnnotations = "annotations" - ClusterFieldAppliedEnableClusterAuth = "appliedEnableAuth" ClusterFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy" ClusterFieldAppliedPodSecurityPolicyTemplateName = "appliedPodSecurityPolicyTemplateId" ClusterFieldAppliedSpec = "appliedSpec" @@ -18,8 +17,6 @@ const ( ClusterFieldCACert = "caCert" ClusterFieldCapabilities = "capabilities" ClusterFieldCapacity = "capacity" - ClusterFieldClusterEndpointFQDN = "clusterEndpointFQDN" - ClusterFieldClusterEndpointFQDNCaCert = "clusterEndpointFQDNCaCert" ClusterFieldComponentStatuses = "componentStatuses" ClusterFieldConditions = "conditions" ClusterFieldCreated = "created" @@ -32,7 +29,6 @@ const ( ClusterFieldDockerRootDir = "dockerRootDir" ClusterFieldDriver = "driver" ClusterFieldEnableClusterAlerting = "enableClusterAlerting" - ClusterFieldEnableClusterAuth = "enableClusterAuth" ClusterFieldEnableClusterMonitoring = "enableClusterMonitoring" ClusterFieldEnableNetworkPolicy = "enableNetworkPolicy" ClusterFieldFailedSpec = "failedSpec" @@ -40,6 +36,7 @@ const ( ClusterFieldInternal = "internal" ClusterFieldLabels = "labels" ClusterFieldLimits = "limits" + ClusterFieldLocalClusterAuthEndpoint = "localClusterAuthEndpoint" ClusterFieldMonitoringStatus = "monitoringStatus" ClusterFieldName = "name" ClusterFieldOwnerReferences = "ownerReferences" @@ -59,7 +56,6 @@ type Cluster struct { AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,omitempty"` Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"` Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` - AppliedEnableClusterAuth bool `json:"appliedEnableAuth,omitempty" yaml:"appliedEnableAuth,omitempty"` AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy,omitempty" yaml:"appliedEnableNetworkPolicy,omitempty"` AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId,omitempty" yaml:"appliedPodSecurityPolicyTemplateId,omitempty"` AppliedSpec *ClusterSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"` @@ -67,8 +63,6 @@ type Cluster struct { CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"` Capabilities *Capabilities `json:"capabilities,omitempty" yaml:"capabilities,omitempty"` Capacity map[string]string `json:"capacity,omitempty" yaml:"capacity,omitempty"` - ClusterEndpointFQDN string `json:"clusterEndpointFQDN,omitempty" yaml:"clusterEndpointFQDN,omitempty"` - ClusterEndpointFQDNCaCert string `json:"clusterEndpointFQDNCaCert,omitempty" yaml:"clusterEndpointFQDNCaCert,omitempty"` ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty" yaml:"componentStatuses,omitempty"` Conditions []ClusterCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` @@ -81,7 +75,6 @@ type Cluster struct { DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` EnableClusterAlerting bool `json:"enableClusterAlerting,omitempty" yaml:"enableClusterAlerting,omitempty"` - EnableClusterAuth bool `json:"enableClusterAuth,omitempty" yaml:"enableClusterAuth,omitempty"` EnableClusterMonitoring bool `json:"enableClusterMonitoring,omitempty" yaml:"enableClusterMonitoring,omitempty"` EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` @@ -89,6 +82,7 @@ type Cluster struct { Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Limits map[string]string `json:"limits,omitempty" yaml:"limits,omitempty"` + LocalClusterAuthEndpoint *LocalClusterAuthEndpoint `json:"localClusterAuthEndpoint,omitempty" yaml:"localClusterAuthEndpoint,omitempty"` MonitoringStatus *MonitoringStatus `json:"monitoringStatus,omitempty" yaml:"monitoringStatus,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go index 25ae2638..f633b87a 100644 --- a/client/management/v3/zz_generated_cluster_spec.go +++ b/client/management/v3/zz_generated_cluster_spec.go @@ -4,8 +4,6 @@ const ( ClusterSpecType = "clusterSpec" ClusterSpecFieldAmazonElasticContainerServiceConfig = "amazonElasticContainerServiceConfig" ClusterSpecFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig" - ClusterSpecFieldClusterEndpointFQDN = "clusterEndpointFQDN" - ClusterSpecFieldClusterEndpointFQDNCaCert = "clusterEndpointFQDNCaCert" ClusterSpecFieldDefaultClusterRoleForProjectMembers = "defaultClusterRoleForProjectMembers" ClusterSpecFieldDefaultPodSecurityPolicyTemplateID = "defaultPodSecurityPolicyTemplateId" ClusterSpecFieldDescription = "description" @@ -14,21 +12,19 @@ const ( ClusterSpecFieldDisplayName = "displayName" ClusterSpecFieldDockerRootDir = "dockerRootDir" ClusterSpecFieldEnableClusterAlerting = "enableClusterAlerting" - ClusterSpecFieldEnableClusterAuth = "enableClusterAuth" ClusterSpecFieldEnableClusterMonitoring = "enableClusterMonitoring" ClusterSpecFieldEnableNetworkPolicy = "enableNetworkPolicy" ClusterSpecFieldGenericEngineConfig = "genericEngineConfig" ClusterSpecFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" ClusterSpecFieldImportedConfig = "importedConfig" ClusterSpecFieldInternal = "internal" + ClusterSpecFieldLocalClusterAuthEndpoint = "localClusterAuthEndpoint" ClusterSpecFieldRancherKubernetesEngineConfig = "rancherKubernetesEngineConfig" ) type ClusterSpec struct { AmazonElasticContainerServiceConfig map[string]interface{} `json:"amazonElasticContainerServiceConfig,omitempty" yaml:"amazonElasticContainerServiceConfig,omitempty"` AzureKubernetesServiceConfig map[string]interface{} `json:"azureKubernetesServiceConfig,omitempty" yaml:"azureKubernetesServiceConfig,omitempty"` - ClusterEndpointFQDN string `json:"clusterEndpointFQDN,omitempty" yaml:"clusterEndpointFQDN,omitempty"` - ClusterEndpointFQDNCaCert string `json:"clusterEndpointFQDNCaCert,omitempty" yaml:"clusterEndpointFQDNCaCert,omitempty"` DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" yaml:"defaultClusterRoleForProjectMembers,omitempty"` DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` @@ -37,12 +33,12 @@ type ClusterSpec struct { DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` EnableClusterAlerting bool `json:"enableClusterAlerting,omitempty" yaml:"enableClusterAlerting,omitempty"` - EnableClusterAuth bool `json:"enableClusterAuth,omitempty" yaml:"enableClusterAuth,omitempty"` EnableClusterMonitoring bool `json:"enableClusterMonitoring,omitempty" yaml:"enableClusterMonitoring,omitempty"` EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` GenericEngineConfig map[string]interface{} `json:"genericEngineConfig,omitempty" yaml:"genericEngineConfig,omitempty"` GoogleKubernetesEngineConfig map[string]interface{} `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"` ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"` Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"` + LocalClusterAuthEndpoint *LocalClusterAuthEndpoint `json:"localClusterAuthEndpoint,omitempty" yaml:"localClusterAuthEndpoint,omitempty"` RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty" yaml:"rancherKubernetesEngineConfig,omitempty"` } diff --git a/client/management/v3/zz_generated_cluster_status.go b/client/management/v3/zz_generated_cluster_status.go index c38cfc72..c52f5e10 100644 --- a/client/management/v3/zz_generated_cluster_status.go +++ b/client/management/v3/zz_generated_cluster_status.go @@ -5,7 +5,6 @@ const ( ClusterStatusFieldAPIEndpoint = "apiEndpoint" ClusterStatusFieldAgentImage = "agentImage" ClusterStatusFieldAllocatable = "allocatable" - ClusterStatusFieldAppliedEnableClusterAuth = "appliedEnableAuth" ClusterStatusFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy" ClusterStatusFieldAppliedPodSecurityPolicyTemplateName = "appliedPodSecurityPolicyTemplateId" ClusterStatusFieldAppliedSpec = "appliedSpec" @@ -27,7 +26,6 @@ type ClusterStatus struct { APIEndpoint string `json:"apiEndpoint,omitempty" yaml:"apiEndpoint,omitempty"` AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,omitempty"` Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"` - AppliedEnableClusterAuth bool `json:"appliedEnableAuth,omitempty" yaml:"appliedEnableAuth,omitempty"` AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy,omitempty" yaml:"appliedEnableNetworkPolicy,omitempty"` AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId,omitempty" yaml:"appliedPodSecurityPolicyTemplateId,omitempty"` AppliedSpec *ClusterSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"` diff --git a/client/management/v3/zz_generated_local_cluster_auth_endpoint.go b/client/management/v3/zz_generated_local_cluster_auth_endpoint.go new file mode 100644 index 00000000..830583d4 --- /dev/null +++ b/client/management/v3/zz_generated_local_cluster_auth_endpoint.go @@ -0,0 +1,14 @@ +package client + +const ( + LocalClusterAuthEndpointType = "localClusterAuthEndpoint" + LocalClusterAuthEndpointFieldCACerts = "caCerts" + LocalClusterAuthEndpointFieldEnabled = "enabled" + LocalClusterAuthEndpointFieldFQDN = "fqdn" +) + +type LocalClusterAuthEndpoint struct { + CACerts string `json:"caCerts,omitempty" yaml:"caCerts,omitempty"` + Enabled bool `json:"enabled,omitempty" yaml:"enabled,omitempty"` + FQDN string `json:"fqdn,omitempty" yaml:"fqdn,omitempty"` +}