Fix up AWS validation, update Azure template as a test

Author: kylewuolle

templates/cluster/azure-hosted-cp/templates/azurecluster.yaml

@@ -17,7 +17,8 @@ spec:
       name: {{ .Values.network.vnetName }}
     subnets:
       - name: {{ .Values.network.nodeSubnetName }}
-        role: node
+        # TODO this is just a test, if this works we need to consider changing this to be able to specify multiple subnets
+        role: cluster
         routeTable:
           name: {{ .Values.network.routeTableName }}
         securityGroup:

test/e2e/managedcluster/aws/aws.go

@@ -67,7 +67,7 @@ func PopulateHostedTemplateVars(ctx context.Context, kc *kubeclient.KubeClient,
 
 	subnetYaml, err := yaml.Marshal(subnetMaps)
 	Expect(err).NotTo(HaveOccurred(), "failed to get marshall subnet maps")
-	GinkgoT().Setenv(managedcluster.EnvVarSubnets, string(subnetYaml))
+	GinkgoT().Setenv(managedcluster.EnvVarAWSSubnets, string(subnetYaml))
 
 	securityGroupID, found, err := unstructured.NestedString(
 		awsCluster.Object, "status", "networkStatus", "securityGroups", "node", "id")

test/e2e/managedcluster/constants.go

@@ -25,15 +25,13 @@ const (
 	EnvVarNoCleanup = "NO_CLEANUP"
 
 	// AWS
-	EnvVarAWSAccessKeyID            = "AWS_ACCESS_KEY_ID"
-	EnvVarAWSSecretAccessKey        = "AWS_SECRET_ACCESS_KEY"
-	EnvVarAWSVPCID                  = "AWS_VPC_ID"
-	EnvVarAWSSubnetID               = "AWS_SUBNET_ID"
-	EnvVarAWSSubnetAvailabilityZone = "AWS_SUBNET_AVAILABILITY_ZONE"
-	EnvVarAWSInstanceType           = "AWS_INSTANCE_TYPE"
-	EnvVarAWSSecurityGroupID        = "AWS_SG_ID"
-	EnvVarAWSClusterIdentity        = "AWS_CLUSTER_IDENTITY"
-	EnvVarSubnets                   = "AWS_SUBNETS"
+	EnvVarAWSAccessKeyID     = "AWS_ACCESS_KEY_ID"
+	EnvVarAWSSecretAccessKey = "AWS_SECRET_ACCESS_KEY"
+	EnvVarAWSVPCID           = "AWS_VPC_ID"
+	EnvVarAWSInstanceType    = "AWS_INSTANCE_TYPE"
+	EnvVarAWSSecurityGroupID = "AWS_SG_ID"
+	EnvVarAWSClusterIdentity = "AWS_CLUSTER_IDENTITY"
+	EnvVarAWSSubnets         = "AWS_SUBNETS"
 
 	// VSphere
 	EnvVarVSphereUser            = "VSPHERE_USER"

test/e2e/managedcluster/managedcluster.go

@@ -127,9 +127,7 @@ func GetUnstructured(templateName Template) *unstructured.Unstructured {
 		// since we populate the vars from standalone prior to this step.
 		ValidateDeploymentVars([]string{
 			EnvVarAWSVPCID,
-			EnvVarAWSSubnetID,
-			EnvVarAWSSubnetAvailabilityZone,
-			EnvVarAWSSecurityGroupID,
+			EnvVarAWSSubnets,
 		})
 		managedClusterTemplateBytes = awsHostedCPManagedClusterTemplateBytes
 	case TemplateVSphereStandaloneCP: