From 7288c05ef134c3466f86d045c69aa8277b13e35d Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 28 Oct 2020 15:32:33 -0700 Subject: [PATCH] test: "useManagedIdentity": false for VMSS masters (#3981) --- test/e2e/engine/template.go | 4 +++- test/e2e/test_cluster_configs/vmss_master.json | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/e2e/engine/template.go b/test/e2e/engine/template.go index e8a403fde6..1f8d3aaf82 100644 --- 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 index 14071faa8b..bb281e796c 100644 --- 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,