Skip to content

Add support for Machine Preservation #229

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

Open
dergeberl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for Machine Preservation #229

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
6 changes: 6 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 @@ -250,6 +250,11 @@ func (w *workerDelegate) generateMachineConfig(ctx context.Context) error {
}
}

var preserveMax int32
if pool.MachineControllerManagerSettings != nil {
preserveMax = ptr.Deref(pool.MachineControllerManagerSettings.AutoPreserveFailedMachineMax, 0)
}

machineDeployments = append(machineDeployments, worker.MachineDeployment{
Name: deploymentName,
ClassName: className,
Expand All @@ -264,6 +269,7 @@ func (w *workerDelegate) generateMachineConfig(ctx context.Context) error {
Taints: pool.Taints,
MachineConfiguration: genericworkeractuator.ReadMachineConfiguration(pool),
ClusterAutoscalerAnnotations: extensionsv1alpha1helper.GetMachineDeploymentClusterAutoscalerAnnotations(pool.ClusterAutoscaler),
AutoPreserveFailedMachineMax: worker.DistributeOverZones(zoneIdx, preserveMax, zoneLen),
})

machineClassSpec["name"] = className
Expand Down
37 changes: 37 additions & 0 deletions pkg/controller/worker/machines_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,6 +1164,43 @@ var _ = Describe("Machines", func() {
Expect(result[1].ClusterAutoscalerAnnotations[extensionsv1alpha1.ScaleDownUtilizationThresholdAnnotation]).To(Equal("0.5"))
})

It("should distribute autoPreserveFailedMachineMax across zones", func() {
w.Spec.Pools[0].MachineControllerManagerSettings = &gardencorev1beta1.MachineControllerManagerSettings{
AutoPreserveFailedMachineMax: new(int32(4)),
}
workerDelegate, _ = NewWorkerDelegate(c, scheme, chartApplier, "", w, cluster, "")

result, err := workerDelegate.GenerateMachineDeployments(ctx)
Expect(err).NotTo(HaveOccurred())
Expect(result).NotTo(BeNil())
Expect(result[0].AutoPreserveFailedMachineMax).To(Equal(int32(2)))
Expect(result[1].AutoPreserveFailedMachineMax).To(Equal(int32(2)))
})

It("should set autoPreserveFailedMachineMax to 0 per zone when machineControllerManagerSettings is nil", func() {
w.Spec.Pools[0].MachineControllerManagerSettings = nil
workerDelegate, _ = NewWorkerDelegate(c, scheme, chartApplier, "", w, cluster, "")

result, err := workerDelegate.GenerateMachineDeployments(ctx)
Expect(err).NotTo(HaveOccurred())
Expect(result).NotTo(BeNil())
Expect(result[0].AutoPreserveFailedMachineMax).To(Equal(int32(0)))
Expect(result[1].AutoPreserveFailedMachineMax).To(Equal(int32(0)))
})

It("should set autoPreserveFailedMachineMax to 0 per zone when autoPreserveFailedMachineMax is nil", func() {
w.Spec.Pools[0].MachineControllerManagerSettings = &gardencorev1beta1.MachineControllerManagerSettings{
AutoPreserveFailedMachineMax: nil,
}
workerDelegate, _ = NewWorkerDelegate(c, scheme, chartApplier, "", w, cluster, "")

result, err := workerDelegate.GenerateMachineDeployments(ctx)
Expect(err).NotTo(HaveOccurred())
Expect(result).NotTo(BeNil())
Expect(result[0].AutoPreserveFailedMachineMax).To(Equal(int32(0)))
Expect(result[1].AutoPreserveFailedMachineMax).To(Equal(int32(0)))
})

DescribeTable("customLabelDomain in machineclass helm chart",
func(customDomain string) {
workerDelegate, _ := NewWorkerDelegate(c, scheme, chartApplier, "", w, cluster, customDomain)
Expand Down