Merge pull request #623 from sdmodi/gnp-xpn-fix

Skip the VPC validation for XPN clusters in GNP controller

Author: k8s-ci-robot

pkg/controller/gkenetworkparamset/gnpcontroller_validations.go

@@ -83,13 +83,15 @@ func (c *Controller) validateGKENetworkParamSet(ctx context.Context, params *net
 		}, nil
 	}
 
-	network, err := c.gceCloud.GetNetwork(params.Spec.VPC)
-	if err != nil || network == nil {
-		return &gnpValidation{
-			IsValid:      false,
-			ErrorReason:  networkv1.VPCNotFound,
-			ErrorMessage: fmt.Sprintf("VPC: %s not found", params.Spec.VPC),
-		}, nil
+	if !c.gceCloud.OnXPN() {
+		network, err := c.gceCloud.GetNetwork(params.Spec.VPC)
+		if err != nil || network == nil {
+			return &gnpValidation{
+				IsValid:      false,
+				ErrorReason:  networkv1.VPCNotFound,
+				ErrorMessage: fmt.Sprintf("VPC: %s not found", params.Spec.VPC),
+			}, nil
+		}
 	}
 
 	//check if both deviceMode and secondary ranges are unspecified

providers/gce/support.go

@@ -34,7 +34,7 @@ type gceProjectRouter struct {
 // ProjectID returns the project ID to be used for the given operation.
 func (r *gceProjectRouter) ProjectID(ctx context.Context, version meta.Version, service string) string {
 	switch service {
-	case "Firewalls", "Routes", "Subnetworks":
+	case "Firewalls", "Routes", "Subnetworks", "Networks":
 		return r.gce.NetworkProjectID()
 	default:
 		return r.gce.projectID