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

Inserts Architecture from worker to machineclass #853

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Inserts Architecture from worker to machineclass #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a58714
Added architecture in worker pool
sssash18 Jan 29, 2024
a4af5b9
Addressed review comments
sssash18 Jan 30, 2024
988ae6d
Addressed review comments
sssash18 Apr 16, 2024
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
1 change: 1 addition & 0 deletions charts/internal/machineclass/templates/machineclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ metadata:
{{- end }}
{{- if $machineClass.nodeTemplate }}
nodeTemplate:
architecture: {{ $machineClass.nodeTemplate.architecture }}
capacity:
{{ toYaml $machineClass.nodeTemplate.capacity | indent 4 }}
instanceType: {{ $machineClass.nodeTemplate.instanceType }}
Expand Down
1 change: 1 addition & 0 deletions charts/internal/machineclass/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ machineClasses:
region: eu-west-1
machineType: m4.xlarge
nodeTemplate:
architecture: amd64
capacity:
cpu: 4
gpu: 0
Expand Down
2 changes: 2 additions & 0 deletions pkg/controller/worker/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,15 @@ func (w *workerDelegate) generateMachineConfig(ctx context.Context) error {
InstanceType: pool.MachineType,
Region: w.worker.Spec.Region,
Zone: zone,
Architecture: &arch,
}
} else if pool.NodeTemplate != nil {
machineClassSpec["nodeTemplate"] = machinev1alpha1.NodeTemplate{
Capacity: pool.NodeTemplate.Capacity,
InstanceType: pool.MachineType,
Region: w.worker.Spec.Region,
Zone: zone,
Architecture: &arch,
}
}

Expand Down
66 changes: 54 additions & 12 deletions pkg/controller/worker/machines_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ var _ = Describe("Machines", func() {
securityGroupID string
keyName string

archAMD string
archARM string
archAMD string
archARM string
archFAKE string

volumeType string
volumeSize int
Expand Down Expand Up @@ -126,9 +127,11 @@ var _ = Describe("Machines", func() {

labels map[string]string

nodeCapacity corev1.ResourceList
nodeTemplateZone1 machinev1alpha1.NodeTemplate
nodeTemplateZone2 machinev1alpha1.NodeTemplate
nodeCapacity corev1.ResourceList
nodeTemplatePool1Zone1 machinev1alpha1.NodeTemplate
nodeTemplatePool2Zone1 machinev1alpha1.NodeTemplate
nodeTemplatePool1Zone2 machinev1alpha1.NodeTemplate
nodeTemplatePool2Zone2 machinev1alpha1.NodeTemplate

machineConfiguration *machinev1alpha1.MachineConfiguration

Expand Down Expand Up @@ -166,6 +169,7 @@ var _ = Describe("Machines", func() {

archAMD = "amd64"
archARM = "arm64"
archFAKE = "fake"

volumeType = "normal"
volumeSize = 20
Expand Down Expand Up @@ -210,18 +214,34 @@ var _ = Describe("Machines", func() {
"gpu": resource.MustParse("1"),
"memory": resource.MustParse("128Gi"),
}
nodeTemplateZone1 = machinev1alpha1.NodeTemplate{
nodeTemplatePool1Zone1 = machinev1alpha1.NodeTemplate{
Capacity: nodeCapacity,
InstanceType: machineType,
Region: region,
Zone: zone1,
Architecture: &archAMD,
}
nodeTemplatePool1Zone2 = machinev1alpha1.NodeTemplate{
Capacity: nodeCapacity,
InstanceType: machineType,
Region: region,
Zone: zone2,
Architecture: &archAMD,
}

nodeTemplateZone2 = machinev1alpha1.NodeTemplate{
nodeTemplatePool2Zone1 = machinev1alpha1.NodeTemplate{
Capacity: nodeCapacity,
InstanceType: machineType,
Region: region,
Zone: zone1,
Architecture: &archARM,
}
nodeTemplatePool2Zone2 = machinev1alpha1.NodeTemplate{
Capacity: nodeCapacity,
InstanceType: machineType,
Region: region,
Zone: zone2,
Architecture: &archARM,
}

machineConfiguration = &machinev1alpha1.MachineConfiguration{}
Expand Down Expand Up @@ -260,6 +280,21 @@ var _ = Describe("Machines", func() {
},
},
},
{
Name: machineImageName,
Versions: []apiv1alpha1.MachineImageVersion{
{
Version: machineImageVersion,
Regions: []apiv1alpha1.RegionAMIMapping{
{
Name: region,
AMI: machineImageAMI,
Architecture: ptr.To(archARM),
},
},
},
},
},
},
}
cloudProfileConfigJSON, _ := json.Marshal(cloudProfileConfig)
Expand Down Expand Up @@ -394,6 +429,7 @@ var _ = Describe("Machines", func() {
{
Name: namePool2,
Minimum: minPool2,
Architecture: ptr.To(archARM),
Maximum: maxPool2,
MaxSurge: maxSurgePool2,
MaxUnavailable: maxUnavailablePool2,
Expand Down Expand Up @@ -573,10 +609,10 @@ var _ = Describe("Machines", func() {
addNameAndSecretToMachineClass(machineClassPool2Zone1, machineClassWithHashPool2Zone1, w.Spec.SecretRef)
addNameAndSecretToMachineClass(machineClassPool2Zone2, machineClassWithHashPool2Zone2, w.Spec.SecretRef)

addNodeTemplateToMachineClass(machineClassPool1Zone1, nodeTemplateZone1)
addNodeTemplateToMachineClass(machineClassPool1Zone2, nodeTemplateZone2)
addNodeTemplateToMachineClass(machineClassPool2Zone1, nodeTemplateZone1)
addNodeTemplateToMachineClass(machineClassPool2Zone2, nodeTemplateZone2)
addNodeTemplateToMachineClass(machineClassPool1Zone1, nodeTemplatePool1Zone1)
addNodeTemplateToMachineClass(machineClassPool1Zone2, nodeTemplatePool1Zone2)
addNodeTemplateToMachineClass(machineClassPool2Zone1, nodeTemplatePool2Zone1)
addNodeTemplateToMachineClass(machineClassPool2Zone2, nodeTemplatePool2Zone2)

machineClasses = map[string]interface{}{"machineClasses": []map[string]interface{}{
machineClassPool1Zone1,
Expand Down Expand Up @@ -675,6 +711,12 @@ var _ = Describe("Machines", func() {
AMI: machineImageAMI,
Architecture: ptr.To(archAMD),
},
{
Name: machineImageName,
Version: machineImageVersion,
AMI: machineImageAMI,
Architecture: ptr.To(archARM),
},
},
}

Expand Down Expand Up @@ -864,7 +906,7 @@ var _ = Describe("Machines", func() {
})

It("should fail because the ami for this architecture cannot be found", func() {
w.Spec.Pools[0].Architecture = ptr.To(archARM)
w.Spec.Pools[0].Architecture = ptr.To(archFAKE)

workerDelegate, _ = NewWorkerDelegate(c, decoder, scheme, chartApplier, "", w, cluster)

Expand Down
Loading