Skip to content

Commit 091f469

Browse files
authored
Merge pull request #1230 from nader-ziada/1175
[backport-release-0.4] Set OsType Linux in ManagedClusterAgentPoolProfileProperties
2 parents ebc75ff + 1411378 commit 091f469

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

cloud/services/agentpools/agentpools.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ func (s *Service) Reconcile(ctx context.Context, spec interface{}) error {
5353
profile := containerservice.AgentPool{
5454
ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{
5555
VMSize: containerservice.VMSizeTypes(agentPoolSpec.SKU),
56+
OsType: containerservice.Linux,
5657
OsDiskSizeGB: &agentPoolSpec.OSDiskSizeGB,
5758
Count: &agentPoolSpec.Replicas,
5859
Type: containerservice.VirtualMachineScaleSets,
@@ -87,6 +88,7 @@ func (s *Service) Reconcile(ctx context.Context, spec interface{}) error {
8788
existingProfile := containerservice.AgentPool{
8889
ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{
8990
VMSize: existingPool.ManagedClusterAgentPoolProfileProperties.VMSize,
91+
OsType: containerservice.Linux,
9092
OsDiskSizeGB: existingPool.ManagedClusterAgentPoolProfileProperties.OsDiskSizeGB,
9193
Count: existingPool.ManagedClusterAgentPoolProfileProperties.Count,
9294
Type: containerservice.VirtualMachineScaleSets,

cloud/services/agentpools/agentpools_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ func TestReconcile(t *testing.T) {
243243
Count: to.Int32Ptr(2),
244244
OsDiskSizeGB: to.Int32Ptr(100),
245245
VMSize: containerservice.VMSizeTypesStandardD2sV3,
246+
OsType: containerservice.Linux,
246247
OrchestratorVersion: to.StringPtr("9.99.9999"),
247248
ProvisioningState: to.StringPtr("Succeeded"),
248249
VnetSubnetID: to.StringPtr(""),

0 commit comments

Comments
 (0)