Merge pull request #1230 from nader-ziada/1175

[backport-release-0.4] Set OsType Linux in ManagedClusterAgentPoolProfileProperties
kubernetes-sigs · Mar 11, 2021 · 091f469 · 091f469
2 parents ebc75ff + 1411378
commit 091f469
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/cloud/services/agentpools/agentpools.go b/cloud/services/agentpools/agentpools.go
@@ -53,6 +53,7 @@ func (s *Service) Reconcile(ctx context.Context, spec interface{}) error {
 	profile := containerservice.AgentPool{
 		ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{
 			VMSize:              containerservice.VMSizeTypes(agentPoolSpec.SKU),
+			OsType:              containerservice.Linux,
 			OsDiskSizeGB:        &agentPoolSpec.OSDiskSizeGB,
 			Count:               &agentPoolSpec.Replicas,
 			Type:                containerservice.VirtualMachineScaleSets,
@@ -87,6 +88,7 @@ func (s *Service) Reconcile(ctx context.Context, spec interface{}) error {
 		existingProfile := containerservice.AgentPool{
 			ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{
 				VMSize:              existingPool.ManagedClusterAgentPoolProfileProperties.VMSize,
+				OsType:              containerservice.Linux,
 				OsDiskSizeGB:        existingPool.ManagedClusterAgentPoolProfileProperties.OsDiskSizeGB,
 				Count:               existingPool.ManagedClusterAgentPoolProfileProperties.Count,
 				Type:                containerservice.VirtualMachineScaleSets,

diff --git a/cloud/services/agentpools/agentpools_test.go b/cloud/services/agentpools/agentpools_test.go
@@ -243,6 +243,7 @@ func TestReconcile(t *testing.T) {
 						Count:               to.Int32Ptr(2),
 						OsDiskSizeGB:        to.Int32Ptr(100),
 						VMSize:              containerservice.VMSizeTypesStandardD2sV3,
+						OsType:              containerservice.Linux,
 						OrchestratorVersion: to.StringPtr("9.99.9999"),
 						ProvisioningState:   to.StringPtr("Succeeded"),
 						VnetSubnetID:        to.StringPtr(""),