Merge pull request #56 from cmurphy/private-cluster-config

Only send PrivateClusterConfig for private clusters
rancher · Jun 25, 2021 · 32889b9 · 32889b9
2 parents acf99be + de5bd34
commit 32889b9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/gke/create.go b/pkg/gke/create.go
@@ -147,7 +147,7 @@ func newClusterCreateRequest(config *gkev1.GKEClusterConfig) *gkeapi.CreateClust
 		}
 	}
 
-	if config.Spec.PrivateClusterConfig != nil {
+	if config.Spec.PrivateClusterConfig != nil && config.Spec.PrivateClusterConfig.EnablePrivateNodes {
 		request.Cluster.PrivateClusterConfig = &gkeapi.PrivateClusterConfig{
 			EnablePrivateEndpoint: config.Spec.PrivateClusterConfig.EnablePrivateEndpoint,
 			EnablePrivateNodes:    config.Spec.PrivateClusterConfig.EnablePrivateNodes,
@@ -232,6 +232,9 @@ func validateCreateRequest(ctx context.Context, client *gkeapi.Service, config *
 	if config.Spec.PrivateClusterConfig == nil {
 		return fmt.Errorf(cannotBeNilError, "privateClusterConfig", config.Name)
 	}
+	if config.Spec.PrivateClusterConfig.EnablePrivateEndpoint && !config.Spec.PrivateClusterConfig.EnablePrivateNodes {
+		return fmt.Errorf("private endpoint requires private nodes for cluster [%s]", config.Name)
+	}
 	if config.Spec.MasterAuthorizedNetworksConfig == nil {
 		return fmt.Errorf(cannotBeNilError, "masterAuthorizedNetworksConfig", config.Name)
 	}