From 0b301183cddcd9f2318bdbc8815bebd14f18cec2 Mon Sep 17 00:00:00 2001 From: Daishan Peng Date: Tue, 5 Dec 2017 13:22:01 -0700 Subject: [PATCH 1/2] add more fields --- apis/management.cattle.io/v3/cluster_types.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index 6806c431..3f93eb6f 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -103,6 +103,24 @@ type GoogleKubernetesEngineConfig struct { Credential string `json:"credential,omitempty"` // Enable alpha feature EnableAlphaFeature bool `json:"enableAlphaFeature,omitempty"` + // Configuration for the HTTP (L7) load balancing controller addon + HTTPLoadBalancing bool `json:"httpLoadBalancing,omitempty"` + // Configuration for the horizontal pod autoscaling feature, which increases or decreases the number of replica pods a replication controller has based on the resource usage of the existing pods + HorizontalPodAutoscaling bool `json:"horizontalPodAutoscaling,omitempty"` + // Configuration for the Kubernetes Dashboard + KubernetesDashboard bool `json:"kubernetesDashboard,omitempty"` + // Configuration for NetworkPolicy + NetworkPolicyConfig bool `json:"networkPolicyConfig,omitempty"` + // The list of Google Compute Engine locations in which the cluster's nodes should be located + Locations []string `json:"locations,omitempty"` + // Image Type + ImageType string `json:"imageType,omitempty"` + // Network + Network string `json:"network,omitempty"` + // Sub Network + SubNetwork string `json:"subNetwork,omitempty"` + // Configuration for LegacyAbac + LegacyAbac bool `json:"legacyAbac,omitempty"` } type AzureKubernetesServiceConfig struct { From 0d2b03f50b5447719a54a462eeddb0880e6bfc9e Mon Sep 17 00:00:00 2001 From: Daishan Peng Date: Tue, 5 Dec 2017 16:27:38 -0700 Subject: [PATCH 2/2] generate changes --- .../v3/zz_generated_deepcopy.go | 5 ++ ...nerated_google_kubernetes_engine_config.go | 68 ++++++++++++------- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 311e0083..59a87c05 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -478,6 +478,11 @@ func (in *GoogleKubernetesEngineConfig) DeepCopyInto(out *GoogleKubernetesEngine (*out)[key] = val } } + if in.Locations != nil { + in, out := &in.Locations, &out.Locations + *out = make([]string, len(*in)) + copy(*out, *in) + } return } diff --git a/client/management/v3/zz_generated_google_kubernetes_engine_config.go b/client/management/v3/zz_generated_google_kubernetes_engine_config.go index ce23b760..1227987a 100644 --- a/client/management/v3/zz_generated_google_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_google_kubernetes_engine_config.go @@ -1,32 +1,50 @@ package client const ( - GoogleKubernetesEngineConfigType = "googleKubernetesEngineConfig" - GoogleKubernetesEngineConfigFieldClusterIpv4Cidr = "clusterIpv4Cidr" - GoogleKubernetesEngineConfigFieldCredential = "credential" - GoogleKubernetesEngineConfigFieldDescription = "description" - GoogleKubernetesEngineConfigFieldDiskSizeGb = "diskSizeGb" - GoogleKubernetesEngineConfigFieldEnableAlphaFeature = "enableAlphaFeature" - GoogleKubernetesEngineConfigFieldLabels = "labels" - GoogleKubernetesEngineConfigFieldMachineType = "machineType" - GoogleKubernetesEngineConfigFieldMasterVersion = "masterVersion" - GoogleKubernetesEngineConfigFieldNodeCount = "nodeCount" - GoogleKubernetesEngineConfigFieldNodeVersion = "nodeVersion" - GoogleKubernetesEngineConfigFieldProjectID = "projectId" - GoogleKubernetesEngineConfigFieldZone = "zone" + GoogleKubernetesEngineConfigType = "googleKubernetesEngineConfig" + GoogleKubernetesEngineConfigFieldClusterIpv4Cidr = "clusterIpv4Cidr" + GoogleKubernetesEngineConfigFieldCredential = "credential" + GoogleKubernetesEngineConfigFieldDescription = "description" + GoogleKubernetesEngineConfigFieldDiskSizeGb = "diskSizeGb" + GoogleKubernetesEngineConfigFieldEnableAlphaFeature = "enableAlphaFeature" + GoogleKubernetesEngineConfigFieldHTTPLoadBalancing = "httpLoadBalancing" + GoogleKubernetesEngineConfigFieldHorizontalPodAutoscaling = "horizontalPodAutoscaling" + GoogleKubernetesEngineConfigFieldImageType = "imageType" + GoogleKubernetesEngineConfigFieldKubernetesDashboard = "kubernetesDashboard" + GoogleKubernetesEngineConfigFieldLabels = "labels" + GoogleKubernetesEngineConfigFieldLegacyAbac = "legacyAbac" + GoogleKubernetesEngineConfigFieldLocations = "locations" + GoogleKubernetesEngineConfigFieldMachineType = "machineType" + GoogleKubernetesEngineConfigFieldMasterVersion = "masterVersion" + GoogleKubernetesEngineConfigFieldNetwork = "network" + GoogleKubernetesEngineConfigFieldNetworkPolicyConfig = "networkPolicyConfig" + GoogleKubernetesEngineConfigFieldNodeCount = "nodeCount" + GoogleKubernetesEngineConfigFieldNodeVersion = "nodeVersion" + GoogleKubernetesEngineConfigFieldProjectID = "projectId" + GoogleKubernetesEngineConfigFieldSubNetwork = "subNetwork" + GoogleKubernetesEngineConfigFieldZone = "zone" ) type GoogleKubernetesEngineConfig struct { - ClusterIpv4Cidr string `json:"clusterIpv4Cidr,omitempty"` - Credential string `json:"credential,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"` + ClusterIpv4Cidr string `json:"clusterIpv4Cidr,omitempty"` + Credential string `json:"credential,omitempty"` + Description string `json:"description,omitempty"` + DiskSizeGb *int64 `json:"diskSizeGb,omitempty"` + EnableAlphaFeature *bool `json:"enableAlphaFeature,omitempty"` + HTTPLoadBalancing *bool `json:"httpLoadBalancing,omitempty"` + HorizontalPodAutoscaling *bool `json:"horizontalPodAutoscaling,omitempty"` + ImageType string `json:"imageType,omitempty"` + KubernetesDashboard *bool `json:"kubernetesDashboard,omitempty"` + Labels map[string]string `json:"labels,omitempty"` + LegacyAbac *bool `json:"legacyAbac,omitempty"` + Locations []string `json:"locations,omitempty"` + MachineType string `json:"machineType,omitempty"` + MasterVersion string `json:"masterVersion,omitempty"` + Network string `json:"network,omitempty"` + NetworkPolicyConfig *bool `json:"networkPolicyConfig,omitempty"` + NodeCount *int64 `json:"nodeCount,omitempty"` + NodeVersion string `json:"nodeVersion,omitempty"` + ProjectID string `json:"projectId,omitempty"` + SubNetwork string `json:"subNetwork,omitempty"` + Zone string `json:"zone,omitempty"` }