Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor change: Replace the hardcoded VM SKU #5910

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

minor change: Replace the hardcoded VM SKU #5910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/aks_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func getBaseClusterModel(clusterName string) *armcontainerservice.ManagedCluster
{
Name: to.Ptr("nodepool1"),
Count: to.Ptr[int32](1),
VMSize: to.Ptr("standard_d2ds_v5"),
VMSize: to.Ptr(config.Config.DefaultVMSKU),
MaxPods: to.Ptr[int32](110),
OSType: to.Ptr(armcontainerservice.OSTypeLinux),
Type: to.Ptr(armcontainerservice.AgentPoolTypeVirtualMachineScaleSets),
Expand Down
3 changes: 3 additions & 0 deletions e2e/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,9 @@ func nvidiaDevicePluginDaemonSet() *appsv1.DaemonSet {
},
},
Spec: corev1.PodSpec{
NodeSelector: map[string]string{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change necessary for this PR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is better to have. the "nvidia-device-plugin" can not be pulled on windows node, so if you check the pods on the AKS cluster being tested, you will see a failing pod. it does not fail the e2e test though, but I think we better to fix it.

"kubernetes.io/os": "linux",
},
Tolerations: []corev1.Toleration{
{
Key: "sku",
Expand Down
4 changes: 2 additions & 2 deletions e2e/node_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func nbcToAKSNodeConfigV1(nbc *datamodel.NodeBootstrappingConfiguration) *aksnod
Version: "v0",
DisableCustomData: false,
LinuxAdminUsername: "azureuser",
VmSize: "Standard_D2ds_v5",
VmSize: config.Config.DefaultVMSKU,
ClusterConfig: &aksnodeconfigv1.ClusterConfig{
Location: nbc.ContainerService.Location,
ResourceGroup: nbc.ResourceGroupName,
Expand Down Expand Up @@ -347,7 +347,7 @@ func baseTemplateLinux(t *testing.T, location string, k8sVersion string, arch st
},
AgentPoolProfile: &datamodel.AgentPoolProfile{
Name: "nodepool2",
VMSize: "Standard_D2ds_v5",
VMSize: config.Config.DefaultVMSKU,
KubeletDiskType: "",
WorkloadRuntime: "",
DNSPrefix: "",
Expand Down
2 changes: 1 addition & 1 deletion e2e/vmss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ func getBaseVMSSModel(s *Scenario, customData, cseCmd string) armcompute.Virtual
model := armcompute.VirtualMachineScaleSet{
Location: to.Ptr(config.Config.Location),
SKU: &armcompute.SKU{
Name: to.Ptr("Standard_D2ds_v5"),
Name: to.Ptr(config.Config.DefaultVMSKU),
Capacity: to.Ptr[int64](1),
},
Properties: &armcompute.VirtualMachineScaleSetProperties{
Expand Down
Loading