diff --git a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go b/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go index b8bebf21..7e2e929e 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go +++ b/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go @@ -6,17 +6,17 @@ import ( ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *AKSConfig) DeepCopyInto(out *AKSConfig) { +func (in *AzureKubernetesServiceConfig) DeepCopyInto(out *AzureKubernetesServiceConfig) { *out = *in return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AKSConfig. -func (in *AKSConfig) DeepCopy() *AKSConfig { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureKubernetesServiceConfig. +func (in *AzureKubernetesServiceConfig) DeepCopy() *AzureKubernetesServiceConfig { if in == nil { return nil } - out := new(AKSConfig) + out := new(AzureKubernetesServiceConfig) in.DeepCopyInto(out) return out } @@ -213,21 +213,21 @@ func (in *ClusterNodeList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { *out = *in - if in.GKEConfig != nil { - in, out := &in.GKEConfig, &out.GKEConfig + if in.GoogleKubernetesEngineConfig != nil { + in, out := &in.GoogleKubernetesEngineConfig, &out.GoogleKubernetesEngineConfig if *in == nil { *out = nil } else { - *out = new(GKEConfig) + *out = new(GoogleKubernetesEngineConfig) (*in).DeepCopyInto(*out) } } - if in.AKSConfig != nil { - in, out := &in.AKSConfig, &out.AKSConfig + if in.AzureKubernetesServiceConfig != nil { + in, out := &in.AzureKubernetesServiceConfig, &out.AzureKubernetesServiceConfig if *in == nil { *out = nil } else { - *out = new(AKSConfig) + *out = new(AzureKubernetesServiceConfig) **out = **in } } @@ -313,7 +313,7 @@ func (in *ETCDService) DeepCopy() *ETCDService { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GKEConfig) DeepCopyInto(out *GKEConfig) { +func (in *GoogleKubernetesEngineConfig) DeepCopyInto(out *GoogleKubernetesEngineConfig) { *out = *in if in.Labels != nil { in, out := &in.Labels, &out.Labels @@ -322,16 +322,15 @@ func (in *GKEConfig) DeepCopyInto(out *GKEConfig) { (*out)[key] = val } } - out.UpdateConfig = in.UpdateConfig return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GKEConfig. -func (in *GKEConfig) DeepCopy() *GKEConfig { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GoogleKubernetesEngineConfig. +func (in *GoogleKubernetesEngineConfig) DeepCopy() *GoogleKubernetesEngineConfig { if in == nil { return nil } - out := new(GKEConfig) + out := new(GoogleKubernetesEngineConfig) in.DeepCopyInto(out) return out } diff --git a/client/cluster/v1/zz_generated_aks_config.go b/client/cluster/v1/zz_generated_aks_config.go deleted file mode 100644 index 5af1e4a8..00000000 --- a/client/cluster/v1/zz_generated_aks_config.go +++ /dev/null @@ -1,8 +0,0 @@ -package client - -const ( - AKSConfigType = "aksConfig" -) - -type AKSConfig struct { -} diff --git a/client/cluster/v1/zz_generated_azure_kubernetes_service_config.go b/client/cluster/v1/zz_generated_azure_kubernetes_service_config.go new file mode 100644 index 00000000..397806f8 --- /dev/null +++ b/client/cluster/v1/zz_generated_azure_kubernetes_service_config.go @@ -0,0 +1,8 @@ +package client + +const ( + AzureKubernetesServiceConfigType = "azureKubernetesServiceConfig" +) + +type AzureKubernetesServiceConfig struct { +} diff --git a/client/cluster/v1/zz_generated_cluster.go b/client/cluster/v1/zz_generated_cluster.go index b0efa95d..5ce33ced 100644 --- a/client/cluster/v1/zz_generated_cluster.go +++ b/client/cluster/v1/zz_generated_cluster.go @@ -5,35 +5,35 @@ import ( ) const ( - ClusterType = "cluster" - ClusterFieldAKSConfig = "aksConfig" - ClusterFieldAPIVersion = "apiVersion" - ClusterFieldAnnotations = "annotations" - ClusterFieldCreated = "created" - ClusterFieldGKEConfig = "gkeConfig" - ClusterFieldKind = "kind" - ClusterFieldLabels = "labels" - ClusterFieldName = "name" - ClusterFieldNamespace = "namespace" - ClusterFieldRKEConfig = "rkeConfig" - ClusterFieldRemoved = "removed" - ClusterFieldUuid = "uuid" + ClusterType = "cluster" + ClusterFieldAPIVersion = "apiVersion" + ClusterFieldAnnotations = "annotations" + ClusterFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig" + ClusterFieldCreated = "created" + ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" + ClusterFieldKind = "kind" + ClusterFieldLabels = "labels" + ClusterFieldName = "name" + ClusterFieldNamespace = "namespace" + ClusterFieldRKEConfig = "rkeConfig" + ClusterFieldRemoved = "removed" + ClusterFieldUuid = "uuid" ) type Cluster struct { types.Resource - AKSConfig *AKSConfig `json:"aksConfig,omitempty"` - APIVersion string `json:"apiVersion,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` - Created string `json:"created,omitempty"` - GKEConfig *GKEConfig `json:"gkeConfig,omitempty"` - Kind string `json:"kind,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - Name string `json:"name,omitempty"` - Namespace string `json:"namespace,omitempty"` - RKEConfig *RKEConfig `json:"rkeConfig,omitempty"` - Removed string `json:"removed,omitempty"` - Uuid string `json:"uuid,omitempty"` + APIVersion string `json:"apiVersion,omitempty"` + Annotations map[string]string `json:"annotations,omitempty"` + AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"` + Created string `json:"created,omitempty"` + GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` + Kind string `json:"kind,omitempty"` + Labels map[string]string `json:"labels,omitempty"` + Name string `json:"name,omitempty"` + Namespace string `json:"namespace,omitempty"` + RKEConfig *RKEConfig `json:"rkeConfig,omitempty"` + Removed string `json:"removed,omitempty"` + Uuid string `json:"uuid,omitempty"` } type ClusterCollection struct { types.Collection diff --git a/client/cluster/v1/zz_generated_cluster_spec.go b/client/cluster/v1/zz_generated_cluster_spec.go index 9466dfee..0f312a9d 100644 --- a/client/cluster/v1/zz_generated_cluster_spec.go +++ b/client/cluster/v1/zz_generated_cluster_spec.go @@ -1,14 +1,14 @@ package client const ( - ClusterSpecType = "clusterSpec" - ClusterSpecFieldAKSConfig = "aksConfig" - ClusterSpecFieldGKEConfig = "gkeConfig" - ClusterSpecFieldRKEConfig = "rkeConfig" + ClusterSpecType = "clusterSpec" + ClusterSpecFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig" + ClusterSpecFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" + ClusterSpecFieldRKEConfig = "rkeConfig" ) type ClusterSpec struct { - AKSConfig *AKSConfig `json:"aksConfig,omitempty"` - GKEConfig *GKEConfig `json:"gkeConfig,omitempty"` - RKEConfig *RKEConfig `json:"rkeConfig,omitempty"` + AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"` + GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` + RKEConfig *RKEConfig `json:"rkeConfig,omitempty"` } diff --git a/client/cluster/v1/zz_generated_gke_config.go b/client/cluster/v1/zz_generated_gke_config.go deleted file mode 100644 index c2eedff2..00000000 --- a/client/cluster/v1/zz_generated_gke_config.go +++ /dev/null @@ -1,34 +0,0 @@ -package client - -const ( - GKEConfigType = "gkeConfig" - GKEConfigFieldClusterIpv4Cidr = "clusterIpv4Cidr" - GKEConfigFieldCredentialPath = "credentialPath" - GKEConfigFieldDescription = "description" - GKEConfigFieldDiskSizeGb = "diskSizeGb" - GKEConfigFieldEnableAlphaFeature = "enableAlphaFeature" - GKEConfigFieldInitialClusterVersion = "initialClusterVersion" - GKEConfigFieldInitialNodeCount = "initialNodeCount" - GKEConfigFieldLabels = "labels" - GKEConfigFieldMachineType = "machineType" - GKEConfigFieldNodePoolID = "nodePoolID" - GKEConfigFieldProjectID = "projectID" - GKEConfigFieldUpdateConfig = "updateConfig" - GKEConfigFieldZone = "zone" -) - -type GKEConfig struct { - ClusterIpv4Cidr string `json:"clusterIpv4Cidr,omitempty"` - CredentialPath string `json:"credentialPath,omitempty"` - Description string `json:"description,omitempty"` - DiskSizeGb int64 `json:"diskSizeGb,omitempty"` - EnableAlphaFeature bool `json:"enableAlphaFeature,omitempty"` - InitialClusterVersion string `json:"initialClusterVersion,omitempty"` - InitialNodeCount int64 `json:"initialNodeCount,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - MachineType string `json:"machineType,omitempty"` - NodePoolID string `json:"nodePoolID,omitempty"` - ProjectID string `json:"projectID,omitempty"` - UpdateConfig gkeUpdateConfig `json:"updateConfig,omitempty"` - Zone string `json:"zone,omitempty"` -} diff --git a/client/cluster/v1/zz_generated_gke_update_config.go b/client/cluster/v1/zz_generated_gke_update_config.go deleted file mode 100644 index 4c9c0c46..00000000 --- a/client/cluster/v1/zz_generated_gke_update_config.go +++ /dev/null @@ -1,14 +0,0 @@ -package client - -const ( - gkeUpdateConfigType = "gkeUpdateConfig" - gkeUpdateConfigFieldMasterVersion = "masterVersion" - gkeUpdateConfigFieldNodeCount = "nodeCount" - gkeUpdateConfigFieldNodeVersion = "nodeVersion" -) - -type gkeUpdateConfig struct { - MasterVersion string `json:"masterVersion,omitempty"` - NodeCount int64 `json:"nodeCount,omitempty"` - NodeVersion string `json:"nodeVersion,omitempty"` -} diff --git a/client/cluster/v1/zz_generated_google_kubernetes_engine_config.go b/client/cluster/v1/zz_generated_google_kubernetes_engine_config.go new file mode 100644 index 00000000..47466a96 --- /dev/null +++ b/client/cluster/v1/zz_generated_google_kubernetes_engine_config.go @@ -0,0 +1,32 @@ +package client + +const ( + GoogleKubernetesEngineConfigType = "googleKubernetesEngineConfig" + GoogleKubernetesEngineConfigFieldClusterIpv4Cidr = "clusterIpv4Cidr" + GoogleKubernetesEngineConfigFieldCredentialPath = "credentialPath" + GoogleKubernetesEngineConfigFieldDescription = "description" + GoogleKubernetesEngineConfigFieldDiskSizeGb = "diskSizeGb" + GoogleKubernetesEngineConfigFieldEnableAlphaFeature = "enableAlphaFeature" + GoogleKubernetesEngineConfigFieldLabels = "labels" + GoogleKubernetesEngineConfigFieldMachineType = "machineType" + GoogleKubernetesEngineConfigFieldMasterVersion = "masterVersion" + GoogleKubernetesEngineConfigFieldNodeCount = "nodeCount" + GoogleKubernetesEngineConfigFieldNodeVersion = "nodeVersion" + GoogleKubernetesEngineConfigFieldProjectID = "projectID" + GoogleKubernetesEngineConfigFieldZone = "zone" +) + +type GoogleKubernetesEngineConfig struct { + ClusterIpv4Cidr string `json:"clusterIpv4Cidr,omitempty"` + CredentialPath string `json:"credentialPath,omitempty"` + Description string `json:"description,omitempty"` + DiskSizeGb int64 `json:"diskSizeGb,omitempty"` + EnableAlphaFeature bool `json:"enableAlphaFeature,omitempty"` + Labels map[string]string `json:"labels,omitempty"` + MachineType string `json:"machineType,omitempty"` + MasterVersion string `json:"masterVersion,omitempty"` + NodeCount int64 `json:"nodeCount,omitempty"` + NodeVersion string `json:"nodeVersion,omitempty"` + ProjectID string `json:"projectID,omitempty"` + Zone string `json:"zone,omitempty"` +}