Merge pull request #50 from cmurphy/revert-norman-strings

Revert "Set norman type to 'nullablestring' for *strings"
rancher · May 20, 2021 · 5bc33b8 · 5bc33b8
2 parents ff54b9b + 2450a6e
commit 5bc33b8
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/pkg/apis/gke.cattle.io/v1/types.go b/pkg/apis/gke.cattle.io/v1/types.go
@@ -40,22 +40,22 @@ type GKEClusterConfigSpec struct {
 	Labels                         map[string]string                  `json:"labels"`
 	EnableKubernetesAlpha          *bool                              `json:"enableKubernetesAlpha"`
 	ClusterAddons                  *GKEClusterAddons                  `json:"clusterAddons"`
-	ClusterIpv4CidrBlock           *string                            `json:"clusterIpv4Cidr" norman:"type=nullablestring"`
+	ClusterIpv4CidrBlock           *string                            `json:"clusterIpv4Cidr"`
 	ProjectID                      string                             `json:"projectID"`
 	GoogleCredentialSecret         string                             `json:"googleCredentialSecret"`
 	ClusterName                    string                             `json:"clusterName"`
-	KubernetesVersion              *string                            `json:"kubernetesVersion" norman:"type=nullablestring"`
-	LoggingService                 *string                            `json:"loggingService" norman:"type=nullablestring"`
-	MonitoringService              *string                            `json:"monitoringService" norman:"type=nullablestring"`
+	KubernetesVersion              *string                            `json:"kubernetesVersion"`
+	LoggingService                 *string                            `json:"loggingService"`
+	MonitoringService              *string                            `json:"monitoringService"`
 	NodePools                      []GKENodePoolConfig                `json:"nodePools"`
-	Network                        *string                            `json:"network,omitempty" norman:"type=nullablestring"`
-	Subnetwork                     *string                            `json:"subnetwork,omitempty" norman:"type=nullablestring"`
+	Network                        *string                            `json:"network,omitempty"`
+	Subnetwork                     *string                            `json:"subnetwork,omitempty"`
 	NetworkPolicyEnabled           *bool                              `json:"networkPolicyEnabled,omitempty"`
 	PrivateClusterConfig           *GKEPrivateClusterConfig           `json:"privateClusterConfig,omitempty"`
 	IPAllocationPolicy             *GKEIPAllocationPolicy             `json:"ipAllocationPolicy,omitempty"`
 	MasterAuthorizedNetworksConfig *GKEMasterAuthorizedNetworksConfig `json:"masterAuthorizedNetworks,omitempty"`
 	Locations                      []string                           `json:"locations"`
-	MaintenanceWindow              *string                            `json:"maintenanceWindow,omitempty" norman:"type=nullablestring"`
+	MaintenanceWindow              *string                            `json:"maintenanceWindow,omitempty"`
 }
 
 type GKEIPAllocationPolicy struct {
@@ -91,8 +91,8 @@ type GKENodePoolConfig struct {
 	Config            *GKENodeConfig          `json:"config,omitempty"`
 	InitialNodeCount  *int64                  `json:"initialNodeCount,omitempty"`
 	MaxPodsConstraint *int64                  `json:"maxPodsConstraint,omitempty"`
-	Name              *string                 `json:"name,omitempty" norman:"type=nullablestring"`
-	Version           *string                 `json:"version,omitempty" norman:"type=nullablestring"`
+	Name              *string                 `json:"name,omitempty"`
+	Version           *string                 `json:"version,omitempty"`
 	Management        *GKENodePoolManagement  `json:"management,omitempty"`
 }