-
Notifications
You must be signed in to change notification settings - Fork 431
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2167 from zmalik/zm/unify-sdk-agentpool-def
use converters for AKS SDK agentpool definition
- Loading branch information
Showing
4 changed files
with
233 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package converters | ||
|
|
||
| import ( | ||
| "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2021-05-01/containerservice" | ||
| "github.com/Azure/go-autorest/autorest/to" | ||
| "sigs.k8s.io/cluster-api-provider-azure/azure" | ||
| ) | ||
|
|
||
| // AgentPoolToManagedClusterAgentPoolProfile converts a AgentPoolSpec to an Azure SDK ManagedClusterAgentPoolProfile used in managedcluster reconcile. | ||
| func AgentPoolToManagedClusterAgentPoolProfile(pool azure.AgentPoolSpec) containerservice.ManagedClusterAgentPoolProfile { | ||
| return containerservice.ManagedClusterAgentPoolProfile{ | ||
| Name: &pool.Name, | ||
| VMSize: &pool.SKU, | ||
| OsType: containerservice.OSTypeLinux, | ||
| OsDiskSizeGB: &pool.OSDiskSizeGB, | ||
| Count: &pool.Replicas, | ||
| Type: containerservice.AgentPoolTypeVirtualMachineScaleSets, | ||
| OrchestratorVersion: pool.Version, | ||
| VnetSubnetID: &pool.VnetSubnetID, | ||
| Mode: containerservice.AgentPoolMode(pool.Mode), | ||
| EnableAutoScaling: pool.EnableAutoScaling, | ||
| MaxCount: pool.MaxCount, | ||
| MinCount: pool.MinCount, | ||
| NodeTaints: &pool.NodeTaints, | ||
| AvailabilityZones: &pool.AvailabilityZones, | ||
| MaxPods: pool.MaxPods, | ||
| OsDiskType: containerservice.OSDiskType(to.String(pool.OsDiskType)), | ||
| NodeLabels: pool.NodeLabels, | ||
| EnableUltraSSD: pool.EnableUltraSSD, | ||
| } | ||
| } | ||
|
|
||
| // AgentPoolToContainerServiceAgentPool converts a AgentPoolSpec to an Azure SDK AgentPool used in agentpool reconcile. | ||
| func AgentPoolToContainerServiceAgentPool(pool azure.AgentPoolSpec) containerservice.AgentPool { | ||
| return containerservice.AgentPool{ | ||
| ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{ | ||
| VMSize: &pool.SKU, | ||
| OsType: containerservice.OSTypeLinux, | ||
| OsDiskSizeGB: &pool.OSDiskSizeGB, | ||
| Count: &pool.Replicas, | ||
| Type: containerservice.AgentPoolTypeVirtualMachineScaleSets, | ||
| OrchestratorVersion: pool.Version, | ||
| VnetSubnetID: &pool.VnetSubnetID, | ||
| Mode: containerservice.AgentPoolMode(pool.Mode), | ||
| EnableAutoScaling: pool.EnableAutoScaling, | ||
| MaxCount: pool.MaxCount, | ||
| MinCount: pool.MinCount, | ||
| NodeTaints: &pool.NodeTaints, | ||
| AvailabilityZones: &pool.AvailabilityZones, | ||
| MaxPods: pool.MaxPods, | ||
| OsDiskType: containerservice.OSDiskType(to.String(pool.OsDiskType)), | ||
| NodeLabels: pool.NodeLabels, | ||
| EnableUltraSSD: pool.EnableUltraSSD, | ||
| }, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package converters | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2021-05-01/containerservice" | ||
| "github.com/Azure/go-autorest/autorest/to" | ||
| . "github.com/onsi/gomega" | ||
| "sigs.k8s.io/cluster-api-provider-azure/azure" | ||
| ) | ||
|
|
||
| func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) { | ||
| cases := []struct { | ||
| name string | ||
| pool azure.AgentPoolSpec | ||
| expect func(*GomegaWithT, containerservice.ManagedClusterAgentPoolProfile) | ||
| }{ | ||
| { | ||
| name: "Should set all values correctly", | ||
| pool: azure.AgentPoolSpec{ | ||
| SKU: "Standard_D2s_v3", | ||
| OSDiskSizeGB: 100, | ||
| Replicas: 2, | ||
| Version: to.StringPtr("1.22.6"), | ||
| VnetSubnetID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-123/providers/Microsoft.Network/virtualNetworks/vnet-123/subnets/subnet-123", | ||
| Mode: "User", | ||
| EnableAutoScaling: to.BoolPtr(true), | ||
| MaxCount: to.Int32Ptr(5), | ||
| MinCount: to.Int32Ptr(2), | ||
| NodeTaints: []string{"key1=value1:NoSchedule"}, | ||
| AvailabilityZones: []string{"zone1"}, | ||
| MaxPods: to.Int32Ptr(60), | ||
| OsDiskType: to.StringPtr(string(containerservice.OSDiskTypeManaged)), | ||
| NodeLabels: map[string]*string{ | ||
| "custom": to.StringPtr("default"), | ||
| }, | ||
| Name: "agentpool1", | ||
| }, | ||
|
|
||
| expect: func(g *GomegaWithT, result containerservice.ManagedClusterAgentPoolProfile) { | ||
| g.Expect(result).To(Equal(containerservice.ManagedClusterAgentPoolProfile{ | ||
| Name: to.StringPtr("agentpool1"), | ||
| VMSize: to.StringPtr("Standard_D2s_v3"), | ||
| OsType: containerservice.OSTypeLinux, | ||
| OsDiskSizeGB: to.Int32Ptr(100), | ||
| Count: to.Int32Ptr(2), | ||
| Type: containerservice.AgentPoolTypeVirtualMachineScaleSets, | ||
| OrchestratorVersion: to.StringPtr("1.22.6"), | ||
| VnetSubnetID: to.StringPtr("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-123/providers/Microsoft.Network/virtualNetworks/vnet-123/subnets/subnet-123"), | ||
| Mode: containerservice.AgentPoolModeUser, | ||
| EnableAutoScaling: to.BoolPtr(true), | ||
| MaxCount: to.Int32Ptr(5), | ||
| MinCount: to.Int32Ptr(2), | ||
| NodeTaints: to.StringSlicePtr([]string{"key1=value1:NoSchedule"}), | ||
| AvailabilityZones: to.StringSlicePtr([]string{"zone1"}), | ||
| MaxPods: to.Int32Ptr(60), | ||
| OsDiskType: containerservice.OSDiskTypeManaged, | ||
| NodeLabels: map[string]*string{ | ||
| "custom": to.StringPtr("default"), | ||
| }, | ||
| })) | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, c := range cases { | ||
| c := c | ||
| t.Run(c.name, func(t *testing.T) { | ||
| t.Parallel() | ||
| g := NewGomegaWithT(t) | ||
| result := AgentPoolToManagedClusterAgentPoolProfile(c.pool) | ||
| c.expect(g, result) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func Test_AgentPoolToAgentPoolToContainerServiceAgentPool(t *testing.T) { | ||
| cases := []struct { | ||
| name string | ||
| pool azure.AgentPoolSpec | ||
| expect func(*GomegaWithT, containerservice.AgentPool) | ||
| }{ | ||
| { | ||
| name: "Should set all values correctly", | ||
| pool: azure.AgentPoolSpec{ | ||
| Name: "agentpool1", | ||
| SKU: "Standard_D2s_v3", | ||
| OSDiskSizeGB: 100, | ||
| Replicas: 2, | ||
| Version: to.StringPtr("1.22.6"), | ||
| VnetSubnetID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-123/providers/Microsoft.Network/virtualNetworks/vnet-123/subnets/subnet-123", | ||
| Mode: "User", | ||
| EnableAutoScaling: to.BoolPtr(true), | ||
| MaxCount: to.Int32Ptr(5), | ||
| MinCount: to.Int32Ptr(2), | ||
| NodeTaints: []string{"key1=value1:NoSchedule"}, | ||
| AvailabilityZones: []string{"zone1"}, | ||
| MaxPods: to.Int32Ptr(60), | ||
| OsDiskType: to.StringPtr(string(containerservice.OSDiskTypeManaged)), | ||
| NodeLabels: map[string]*string{ | ||
| "custom": to.StringPtr("default"), | ||
| }, | ||
| }, | ||
|
|
||
| expect: func(g *GomegaWithT, result containerservice.AgentPool) { | ||
| g.Expect(result).To(Equal(containerservice.AgentPool{ | ||
| ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{ | ||
| VMSize: to.StringPtr("Standard_D2s_v3"), | ||
| OsType: containerservice.OSTypeLinux, | ||
| OsDiskSizeGB: to.Int32Ptr(100), | ||
| Count: to.Int32Ptr(2), | ||
| Type: containerservice.AgentPoolTypeVirtualMachineScaleSets, | ||
| OrchestratorVersion: to.StringPtr("1.22.6"), | ||
| VnetSubnetID: to.StringPtr("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg-123/providers/Microsoft.Network/virtualNetworks/vnet-123/subnets/subnet-123"), | ||
| Mode: containerservice.AgentPoolModeUser, | ||
| EnableAutoScaling: to.BoolPtr(true), | ||
| MaxCount: to.Int32Ptr(5), | ||
| MinCount: to.Int32Ptr(2), | ||
| NodeTaints: to.StringSlicePtr([]string{"key1=value1:NoSchedule"}), | ||
| AvailabilityZones: to.StringSlicePtr([]string{"zone1"}), | ||
| MaxPods: to.Int32Ptr(60), | ||
| OsDiskType: containerservice.OSDiskTypeManaged, | ||
| NodeLabels: map[string]*string{ | ||
| "custom": to.StringPtr("default"), | ||
| }, | ||
| }, | ||
| })) | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, c := range cases { | ||
| c := c | ||
| t.Run(c.name, func(t *testing.T) { | ||
| t.Parallel() | ||
| g := NewGomegaWithT(t) | ||
| result := AgentPoolToContainerServiceAgentPool(c.pool) | ||
| c.expect(g, result) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters