Merge pull request #10526 from justinsb/kubetest2_admin_access

kubetest2: support specifying admin-access value

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

@@ -55,6 +55,8 @@ type deployer struct {
 
 	ArtifactsDir string `flag:"-"`
 
+	AdminAccess string `flag:"admin-access" desc:"The CIDR to restrict kubernetes API access"`
+
 	BuildOptions *builder.BuildOptions
 }
 

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

@@ -38,10 +38,15 @@ func (d *deployer) Up() error {
 		return err
 	}
 
+	adminAccess := d.AdminAccess
+	if adminAccess == "" {
+		adminAccess = publicIP
+	}
+
 	args := []string{
 		d.KopsBinaryPath, "create", "cluster",
 		"--name", d.ClusterName,
-		"--admin-access", publicIP,
+		"--admin-access", adminAccess,
 		"--cloud", d.CloudProvider,
 		"--kubernetes-version", d.KubernetesVersion,
 		"--master-count", "1",