Merge pull request #18158 from rifelpet/gce-apiserver

gce: Fix apiserver e2e template

Author: k8s-ci-robot

tests/e2e/kubetest2-kops/deployer/template.go

@@ -73,14 +73,19 @@ func (d *deployer) templateValues(zones []string, publicIP string) (map[string]i
 	if err != nil {
 		return nil, fmt.Errorf("error reading public key file: %q", err)
 	}
-	return map[string]interface{}{
+	values := map[string]interface{}{
 		"cloudProvider":     d.CloudProvider,
 		"clusterName":       d.ClusterName,
 		"kubernetesVersion": d.KubernetesVersion,
 		"publicIP":          publicIP,
 		"stateStore":        d.stateStore(),
 		"discoveryStore":    d.discoveryStore(),
 		"zones":             zones,
+		"region":            d.region,
 		"sshPublicKey":      string(publicKey),
-	}, nil
+	}
+	if d.GCPProject != "" {
+		values["project"] = d.GCPProject
+	}
+	return values, nil
 }

tests/e2e/templates/apiserver-gce.yaml.tmpl

@@ -39,12 +39,13 @@ spec:
   nodePortAccess:
     - 0.0.0.0/0
   nonMasqueradeCIDR: 100.64.0.0/10
+  project: {{.project}}
   sshAccess:
     - {{.publicIP}}
   subnets:
   - cidr: 10.0.16.0/20
-    name: {{$zone}}
-    region: {{$zone}}
+    name: {{.region}}
+    region: {{.region}}
     type: Public
   topology:
     dns:
@@ -77,7 +78,7 @@ spec:
   role: Node
   rootVolumeSize: 100
   subnets:
-  - {{$zone}}
+  - {{.region}}
   zones:
   - {{$zone}}
 
@@ -97,7 +98,7 @@ spec:
   role: Master
   rootVolumeSize: 48
   subnets:
-  - {{$zone}}
+  - {{.region}}
   zones:
   - {{$zone}}
 
@@ -117,6 +118,6 @@ spec:
   role: APIServer
   rootVolumeSize: 48
   subnets:
-  - {{$zone}}
+  - {{.region}}
   zones:
   - {{$zone}}