test: "useManagedIdentity": false for VMSS masters (Azure#3981)

jackfrancis · Oct 28, 2020 · 7288c05 · 7288c05
1 parent abd9bec
commit 7288c05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/test/e2e/engine/template.go b/test/e2e/engine/template.go
@@ -151,7 +151,9 @@ func Build(cfg *config.Config, masterSubnetID string, agentSubnetIDs []string, i
 		prop.OrchestratorProfile.KubernetesConfig.UserAssignedID = config.MSIUserAssignedID
 	}
 
-	prop.OrchestratorProfile.KubernetesConfig.UseManagedIdentity = to.BoolPtr(config.UseManagedIdentity)
+	if prop.OrchestratorProfile.KubernetesConfig.UseManagedIdentity == nil {
+		prop.OrchestratorProfile.KubernetesConfig.UseManagedIdentity = to.BoolPtr(config.UseManagedIdentity)
+	}
 
 	if config.ClientID != "" && config.ClientSecret != "" && !(prop.OrchestratorProfile.KubernetesConfig != nil && to.Bool(prop.OrchestratorProfile.KubernetesConfig.UseManagedIdentity)) {
 		if !prop.IsAzureStackCloud() {

diff --git a/test/e2e/test_cluster_configs/vmss_master.json b/test/e2e/test_cluster_configs/vmss_master.json
@@ -4,7 +4,10 @@
 		"apiVersion": "vlabs",
 		"properties": {
 			"orchestratorProfile": {
-				"orchestratorType": "Kubernetes"
+				"orchestratorType": "Kubernetes",
+				"kubernetesConfig": {
+					"useManagedIdentity": false
+				}
 			},
 			"masterProfile": {
 				"count": 3,