don't change val during upgrade/scale

Azure · Sep 22, 2020 · c0b127a · c0b127a
1 parent cab4b53
commit c0b127a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/pkg/api/defaults.go b/pkg/api/defaults.go
@@ -177,7 +177,8 @@ func (cs *ContainerService) setOrchestratorDefaults(isUpgrade, isScale bool) {
 			}
 		}
 
-		if !cs.Properties.IsHostedMasterProfile() &&
+		if !isUpgrade && !isScale &&
+			!cs.Properties.IsHostedMasterProfile() &&
 			!cs.Properties.IsCustomCloudProfile() &&
 			!cs.Properties.MasterProfile.IsVirtualMachineScaleSets() &&
 			o.KubernetesConfig.UseManagedIdentity == nil {

diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go
@@ -815,6 +815,24 @@ func TestDefaultUseManagedIdentity(t *testing.T) {
 		t.Errorf("expected UseManagedIdentity to be false by default in VMSS control plane context, instead got %t", to.Bool(mockCS.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity))
 	}
 
+	isUpgrade = true
+	isScale = false
+	mockCS = getMockBaseContainerService("1.18.8")
+	mockCS.Properties.OrchestratorProfile.OrchestratorType = Kubernetes
+	mockCS.setOrchestratorDefaults(isUpgrade, isScale)
+	if mockCS.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity != nil {
+		t.Errorf("expected UseManagedIdentity to be unchanged by default in upgrade context, instead got %t", to.Bool(mockCS.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity))
+	}
+
+	isUpgrade = false
+	isScale = true
+	mockCS = getMockBaseContainerService("1.18.8")
+	mockCS.Properties.OrchestratorProfile.OrchestratorType = Kubernetes
+	mockCS.setOrchestratorDefaults(isUpgrade, isScale)
+	if mockCS.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity != nil {
+		t.Errorf("expected UseManagedIdentity to be unchanged by default in scale context, instead got %t", to.Bool(mockCS.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity))
+	}
+
 	mockCS = getMockBaseContainerService("1.18.8")
 	mockCS.Properties.OrchestratorProfile.OrchestratorType = Kubernetes
 	mockCS.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity = to.BoolPtr(false)