Merge branch 'v1.1.x' into tg/support-provider-id-format-of-upstream-ccm

Author: guettli

.builder-image-version.txt

@@ -1 +1 @@
-1.0.25
+1.0.26

.github/workflows/main-promote-builder-image.yml

@@ -10,7 +10,7 @@ jobs:
     name: Promote Latest tag to Caph Builder Image
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.25
+      image: ghcr.io/syself/caph-builder:1.0.26
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

.github/workflows/pr-e2e.yaml

@@ -39,7 +39,7 @@ jobs:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.25
+      image: ghcr.io/syself/caph-builder:1.0.26
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

.github/workflows/pr-lint.yml

@@ -22,7 +22,7 @@ jobs:
     name: "Lint Pull Request"
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.25
+      image: ghcr.io/syself/caph-builder:1.0.26
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

.github/workflows/pr-verify.yml

@@ -11,7 +11,7 @@ jobs:
       issues: write
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.25
+      image: ghcr.io/syself/caph-builder:1.0.26
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

.github/workflows/schedule-scan-image.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'syself/cluster-api-provider-hetzner'
     container:
-      image: ghcr.io/syself/caph-builder:1.0.25
+      image: ghcr.io/syself/caph-builder:1.0.26
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

.gitignore

@@ -36,6 +36,7 @@ test/e2e/data/infrastructure-hetzner/v1beta1/env*
 /tilt.d
 tilt_config.json
 baremetalhosts.yaml
+bm-*.yaml
 
 # kubeconfigs
 ./kind.kubeconfig

api/v1beta1/hcloudmachine_types.go

@@ -120,12 +120,18 @@ type HCloudMachineStatus struct {
 	// FailureReason will be set in the event that there is a terminal problem
 	// reconciling the Machine and will contain a succinct value suitable
 	// for machine interpretation.
+	//
+	// Deprecated: This field is deprecated and is going to be removed when support for v1beta1 will be dropped. Please see https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more details.
+	//
 	// +optional
 	FailureReason *capierrors.MachineStatusError `json:"failureReason,omitempty"`
 
 	// FailureMessage will be set in the event that there is a terminal problem
 	// reconciling the Machine and will contain a more verbose string suitable
 	// for logging and human consumption.
+	//
+	// Deprecated: This field is deprecated and is going to be removed when support for v1beta1 will be dropped. Please see https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more details.
+	//
 	// +optional
 	FailureMessage *string `json:"failureMessage,omitempty"`
 

api/v1beta1/hetznerbaremetalhost_types.go

@@ -342,6 +342,11 @@ func (sts ControllerGeneratedStatus) GetIPAddress() string {
 	return sts.IPv4
 }
 
+// HasFatalError returns true, if the corresponding capi machine should get deleted.
+func (sts ControllerGeneratedStatus) HasFatalError() bool {
+	return sts.ErrorType == FatalError || sts.ErrorType == PermanentError
+}
+
 // GetConditions returns the observations of the operational state of the HetznerBareMetalHost resource.
 func (host *HetznerBareMetalHost) GetConditions() clusterv1.Conditions {
 	return host.Spec.Status.Conditions

api/v1beta1/hetznerbaremetalmachine_types.go

@@ -363,12 +363,6 @@ func (hbmm *HetznerBareMetalMachine) SetConditions(conditions clusterv1.Conditio
 	hbmm.Status.Conditions = conditions
 }
 
-// SetFailure sets a failure reason and message.
-func (hbmm *HetznerBareMetalMachine) SetFailure(reason string, message string) {
-	hbmm.Status.FailureReason = &reason
-	hbmm.Status.FailureMessage = &message
-}
-
 // GetImageSuffix tests whether the suffix is known and outputs it if yes. Otherwise it returns an error.
 func GetImageSuffix(url string) (string, error) {
 	if strings.HasPrefix(url, "oci://") {