🌱 Go Code Update (pre capi v1.11 (beta2)) (#1772)

Author: guettli

api/v1beta1/conditions_const.go

@@ -99,7 +99,9 @@ const (
 )
 
 const (
-	// HostReadyCondition reports on whether the HetznerBareMetalHost is ready or not.
+	// HostReadyCondition reports on whether the HetznerBareMetalHost is ready or not. The hbmm
+	// reconciler reads the clusterv1.ReadyCondition condition from the host, and mirrors the Reason
+	// and Message on the HostReadyCondition of the hbmm.
 	HostReadyCondition clusterv1.ConditionType = "HostReady"
 )
 

api/v1beta1/hcloudmachine_validation_test.go

@@ -41,7 +41,7 @@ func TestValidateHCloudMachineSpecUpdate(t *testing.T) {
 			args: args{
 				oldSpec: HCloudMachineSpec{
 					ImageName: "ubuntu-24.04",
-					Type:      "cpx11",
+					Type:      "cpx22",
 				},
 				newSpec: HCloudMachineSpec{
 					ImageName: "ubuntu-24.04",
@@ -129,13 +129,13 @@ func TestValidateHCloudMachineSpecUpdate(t *testing.T) {
 			name: "No Errors",
 			args: args{
 				oldSpec: HCloudMachineSpec{
-					Type:               "cpx11",
+					Type:               "cpx22",
 					ImageName:          "ubuntu-24.04",
 					SSHKeys:            []SSHKey{{Name: "ssh-key-1"}},
 					PlacementGroupName: createPlacementGroupName("placement-group-1"),
 				},
 				newSpec: HCloudMachineSpec{
-					Type:               "cpx11",
+					Type:               "cpx22",
 					ImageName:          "ubuntu-24.04",
 					SSHKeys:            []SSHKey{{Name: "ssh-key-1"}},
 					PlacementGroupName: createPlacementGroupName("placement-group-1"),

api/v1beta1/hetznerbaremetalhost_types.go

@@ -262,8 +262,12 @@ type ControllerGeneratedStatus struct {
 	// +optional
 	UserData *corev1.SecretReference `json:"userData,omitempty"`
 
-	// InstallImage is the configuration that is used for the autosetup configuration for installing an OS via InstallImage.
-	// +optional
+	// InstallImage is the configuration that is used for the autosetup configuration for installing
+	// an OS via InstallImage. The field has an additional usage: When a hbmm gets deleted, then the
+	// hbmm controller sets this field of the hbmh to nil. This indicates the hbmh controller that
+	// deprovisioning should started
+	//
+	//  +optional
 	InstallImage *InstallImage `json:"installImage,omitempty"`
 
 	// StatusHardwareDetails are automatically gathered and should not be modified by the user.

config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerbaremetalhosts.yaml

@@ -355,8 +355,11 @@ spec:
                       needed as some necessary information is stored there, e.g. the hrobot password.
                     type: string
                   installImage:
-                    description: InstallImage is the configuration that is used for
-                      the autosetup configuration for installing an OS via InstallImage.
+                    description: |-
+                      InstallImage is the configuration that is used for the autosetup configuration for installing
+                      an OS via InstallImage. The field has an additional usage: When a hbmm gets deleted, then the
+                      hbmm controller sets this field of the hbmh to nil. This indicates the hbmh controller that
+                      deprovisioning should started
                     properties:
                       btrfsDefinitions:
                         description: BTRFSDefinitions define the btrfs subvolume definitions

controllers/controllers_suite_test.go

@@ -70,6 +70,7 @@ func TestControllers(t *testing.T) {
 }
 
 type ControllerResetter struct {
+	debug                                 bool
 	HetznerClusterReconciler              *HetznerClusterReconciler
 	HCloudMachineReconciler               *HCloudMachineReconciler
 	HCloudMachineTemplateReconciler       *HCloudMachineTemplateReconciler
@@ -96,6 +97,7 @@ func NewControllerResetter(
 		HetznerBareMetalMachineReconciler:     hetznerBareMetalMachineReconciler,
 		HCloudRemediationReconciler:           hcloudRemediationReconciler,
 		HetznerBareMetalRemediationReconciler: hetznerBareMetalRemediationReconciler,
+		debug:                                 os.Getenv("DEBUG") != "",
 	}
 }
 
@@ -159,6 +161,10 @@ func (r *ControllerResetter) ResetAndInitNamespace(namespace string, testEnv *he
 	r.HetznerBareMetalMachineReconciler.Namespace = namespace
 
 	r.HetznerBareMetalRemediationReconciler.Namespace = namespace
+
+	if r.debug {
+		testEnv.GetLogger().Info("Starting test: ===> ===> ===> ===> ===> ===> ===> " + t.Name())
+	}
 }
 
 var _ = BeforeSuite(func() {

controllers/hcloudmachine_controller_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package controllers
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -346,7 +347,7 @@ var _ = Describe("HCloudMachineReconciler", func() {
 					},
 					Spec: infrav1.HCloudMachineSpec{
 						ImageName:          "my-control-plane",
-						Type:               "cpx31",
+						Type:               "cpx32",
 						PlacementGroupName: &defaultPlacementGroupName,
 					},
 				}
@@ -387,9 +388,23 @@ var _ = Describe("HCloudMachineReconciler", func() {
 
 				By("checking that bootstrap condition is not ready")
 
-				Eventually(func() bool {
-					return isPresentAndFalseWithReason(key, hcloudMachine, infrav1.BootstrapReadyCondition, infrav1.BootstrapNotReadyReason)
-				}, timeout, interval).Should(BeTrue())
+				Eventually(func() error {
+					err := testEnv.Get(ctx, client.ObjectKeyFromObject(hcloudMachine), hcloudMachine)
+					if err != nil {
+						return err
+					}
+					c := conditions.Get(hcloudMachine, infrav1.BootstrapReadyCondition)
+					if c == nil {
+						return fmt.Errorf("BootstrapReadyCondition not set")
+					}
+					if c.Status != corev1.ConditionFalse {
+						return fmt.Errorf("BootstrapReadyCondition not false")
+					}
+					if c.Reason != infrav1.BootstrapNotReadyReason {
+						return fmt.Errorf("BootstrapNotReadyReason not set. Reason: %q", c.Reason)
+					}
+					return nil
+				}, timeout, interval).Should(Succeed())
 
 				By("setting the bootstrap data")
 
@@ -479,7 +494,7 @@ var _ = Describe("HCloudMachineReconciler", func() {
 					},
 					Spec: infrav1.HCloudMachineSpec{
 						ImageName:          "my-control-plane-2",
-						Type:               "cpx31",
+						Type:               "cpx32",
 						PlacementGroupName: &defaultPlacementGroupName,
 					},
 				}
@@ -523,7 +538,7 @@ var _ = Describe("HCloudMachineReconciler", func() {
 				},
 				Spec: infrav1.HCloudMachineSpec{
 					ImageName:          "my-control-plane",
-					Type:               "cpx31",
+					Type:               "cpx32",
 					PlacementGroupName: &defaultPlacementGroupName,
 				},
 			}
@@ -613,6 +628,24 @@ var _ = Describe("HCloudMachineReconciler", func() {
 					EnableIPv6: false,
 				}
 				Expect(testEnv.Create(ctx, hetznerCluster)).To(Succeed())
+				Eventually(func() bool {
+					var updatedCluster infrav1.HetznerCluster
+					if err := testEnv.Get(ctx, client.ObjectKeyFromObject(hetznerCluster), &updatedCluster); err != nil {
+						return false
+					}
+
+					if updatedCluster.Spec.ControlPlaneEndpoint == nil {
+						return false
+					}
+					if updatedCluster.Status.ControlPlaneLoadBalancer == nil {
+						return false
+					}
+					if updatedCluster.Status.ControlPlaneLoadBalancer.IPv4 == "" {
+						return false
+					}
+
+					return updatedCluster.Spec.ControlPlaneEndpoint.Host == updatedCluster.Status.ControlPlaneLoadBalancer.IPv4
+				}, timeout, interval).Should(BeTrue())
 				Expect(testEnv.Create(ctx, hcloudMachine)).To(Succeed())
 			})
 
@@ -740,7 +773,7 @@ var _ = Describe("Hetzner secret", func() {
 			},
 			Spec: infrav1.HCloudMachineSpec{
 				ImageName:          "my-control-plane",
-				Type:               "cpx31",
+				Type:               "cpx32",
 				PlacementGroupName: &defaultPlacementGroupName,
 			},
 		}
@@ -816,7 +849,7 @@ var _ = Describe("HCloudMachine validation", func() {
 			},
 			Spec: infrav1.HCloudMachineSpec{
 				ImageName: "my-control-plane",
-				Type:      "cpx31",
+				Type:      "cpx32",
 			},
 		}
 	})
@@ -842,7 +875,7 @@ var _ = Describe("HCloudMachine validation", func() {
 			return testEnv.Client.Get(ctx, key, hcloudMachine)
 		}, timeout, interval).Should(BeNil())
 
-		hcloudMachine.Spec.Type = "cpx32"
+		hcloudMachine.Spec.Type = "cpx42"
 		hcloudMachine.Spec.ImageName = "my-control-plane"
 		Expect(testEnv.Update(ctx, hcloudMachine)).ToNot(Succeed())
 	})

controllers/hcloudmachinetemplate_controller_test.go

@@ -110,7 +110,7 @@ var _ = Describe("HCloudMachineTemplateReconciler", func() {
 						Template: infrav1.HCloudMachineTemplateResource{
 							Spec: infrav1.HCloudMachineSpec{
 								ImageName:          "my-control-plane",
-								Type:               "cpx31",
+								Type:               "cpx32",
 								PlacementGroupName: &defaultPlacementGroupName,
 							},
 						},
@@ -187,7 +187,7 @@ var _ = Describe("HCloudMachineTemplateReconciler", func() {
 						Template: infrav1.HCloudMachineTemplateResource{
 							Spec: infrav1.HCloudMachineSpec{
 								ImageName:          "my-control-plane",
-								Type:               "cpx31",
+								Type:               "cpx32",
 								PlacementGroupName: &defaultPlacementGroupName,
 							},
 						},

controllers/hcloudremediation_controller_test.go

@@ -151,7 +151,7 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 			},
 			Spec: infrav1.HCloudMachineSpec{
 				ImageName: "my-control-plane",
-				Type:      "cpx31",
+				Type:      "cpx32",
 			},
 		}
 		Expect(testEnv.Create(ctx, hcloudMachine)).To(Succeed())
@@ -253,6 +253,9 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 				if hcloudMachine.Spec.ProviderID == nil {
 					return fmt.Errorf("hcloudMachine.Spec.ProviderID is still nil")
 				}
+				if hcloudMachine.Status.BootState != infrav1.HCloudBootStateOperatingSystemRunning {
+					return fmt.Errorf("hcloudMachine.Status.BootState is not HCloudBootStateOperatingSystemRunning, but: %q", hcloudMachine.Status.BootState)
+				}
 				return nil
 			}).NotTo(HaveOccurred())
 
@@ -283,9 +286,12 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 				if hcloudMachine.Spec.ProviderID == nil {
 					return fmt.Errorf("hcloudMachine.Spec.ProviderID is still nil")
 				}
+				if hcloudMachine.Status.BootState != infrav1.HCloudBootStateOperatingSystemRunning {
+					return fmt.Errorf("Expected HCloudBootStateOperatingSystemRunning, but: %q",
+						hcloudMachine.Status.BootState)
+				}
 				return nil
 			}).NotTo(HaveOccurred())
-
 			hcloudRemediation.Status.RetryCount = hcloudRemediation.Spec.Strategy.RetryLimit
 			Expect(testEnv.Create(ctx, hcloudRemediation)).To(Succeed())
 
@@ -294,7 +300,7 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 					return err
 				}
 				if hcloudRemediation.Status.Phase != infrav1.PhaseWaiting {
-					return fmt.Errorf("hcloudRemediation.Status.Phase != infrav1.PhaseWaiting (phase is %s)", hcloudRemediation.Status.Phase)
+					return fmt.Errorf("hcloudRemediation.Status.Phase != infrav1.PhaseWaiting (phase is %q)", hcloudRemediation.Status.Phase)
 				}
 				return nil
 			}, timeout).ShouldNot(HaveOccurred())
@@ -333,10 +339,16 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 				Name: "myserver",
 			})
 			Expect(err).ShouldNot(HaveOccurred())
-			providerID := hcloudutil.ProviderIDFromServerID(int(server.ID))
-			hcloudMachine.Spec.ProviderID = &providerID
-			err = testEnv.Update(ctx, hcloudMachine)
-			Expect(err).ShouldNot(HaveOccurred())
+
+			Eventually(func() error {
+				err := testEnv.Get(ctx, client.ObjectKeyFromObject(hcloudMachine), hcloudMachine)
+				if err != nil {
+					return err
+				}
+				providerID := hcloudutil.ProviderIDFromServerID(int(server.ID))
+				hcloudMachine.Spec.ProviderID = &providerID
+				return testEnv.Update(ctx, hcloudMachine)
+			}, timeout).Should(Succeed())
 
 			By("Call SetRemediateMachineAnnotationToDeleteMachine")
 			Eventually(func() error {
@@ -388,6 +400,18 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 			err = controllerutil.SetOwnerReference(capiMachine, rem, testEnv.GetScheme())
 			Expect(err).Should(Succeed())
 
+			Eventually(func() error {
+				err := testEnv.Get(ctx, client.ObjectKeyFromObject(hcloudMachine), hcloudMachine)
+				if err != nil {
+					return err
+				}
+				if hcloudMachine.Status.BootState != infrav1.HCloudBootStateProvisioningFailed {
+					return fmt.Errorf("Expected HCloudBootStateProvisioningFailed, got %q",
+						hcloudMachine.Status.BootState)
+				}
+				return nil
+			}, timeout).Should(Succeed())
+
 			err = testEnv.Create(ctx, rem)
 			Expect(err).ShouldNot(HaveOccurred())
 

controllers/hetznerbaremetalhost_controller.go

@@ -153,7 +153,9 @@ func (r *HetznerBareMetalHostReconciler) Reconcile(ctx context.Context, req ctrl
 		if err != nil {
 			log.Error(err, "cache sync failed after BootState change")
 		}
-		log.Info("Wait for update being in local cache", "durationWaitForLocalCacheSync", time.Since(startReadOwnWrite).Round(time.Millisecond))
+		if time.Since(startReadOwnWrite) > 50*time.Millisecond {
+			log.Info("Wait for update being in local cache", "durationWaitForLocalCacheSync", time.Since(startReadOwnWrite).Round(time.Millisecond))
+		}
 	}()
 	// End: avoid conflict errors. Wait until local cache is up-to-date
 	// ----------------------------------------------------------------

controllers/hetznerbaremetalmachine_controller_test.go

@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 	"time"
 
@@ -660,9 +661,35 @@ var _ = Describe("HetznerBareMetalMachineReconciler", func() {
 			})
 
 			It("checks for HostReadyCondition False for hetznerBareMetalMachine with HetznerSecretUnreachableReason", func() {
-				Eventually(func() bool {
-					return isPresentAndFalseWithReason(key, bmMachine, infrav1.HostReadyCondition, infrav1.OSSSHSecretMissingReason)
-				}, timeout, time.Second).Should(BeTrue())
+				magicString := "could not find OSSSHSecret: failed to fetch secret os-ssh-secret"
+				Eventually(func() error {
+					err := testEnv.Get(ctx, client.ObjectKeyFromObject(host), host)
+					if err != nil {
+						return err
+					}
+					c := conditions.Get(host, clusterv1.ReadyCondition)
+					if c == nil {
+						return fmt.Errorf("ReadyCondition not set on host")
+					}
+					if !strings.Contains(c.Message, magicString) {
+						return fmt.Errorf("CredentialsAvailable substring not set (on host). Conditions: %+v", host.Spec.Status.Conditions)
+					}
+					err = testEnv.Get(ctx, client.ObjectKeyFromObject(bmMachine), bmMachine)
+					if err != nil {
+						return err
+					}
+					c = conditions.Get(bmMachine, infrav1.HostReadyCondition)
+					if c == nil {
+						return fmt.Errorf("HostReadyCondition not set on hbmm")
+					}
+					if c.Reason != infrav1.OSSSHSecretMissingReason {
+						return fmt.Errorf("%s not set on hbmm. is %q - Conditions: %+v", infrav1.OSSSHSecretMissingReason, c.Reason, bmMachine.Status.Conditions)
+					}
+					if !strings.Contains(c.Message, magicString) {
+						return fmt.Errorf("CredentialsAvailable substring not set (on hbmm). Conditions: %+v", bmMachine.Status.Conditions)
+					}
+					return nil
+				}, timeout, time.Second).Should(Succeed())
 			})
 		})
 	})