Merge remote-tracking branch 'origin/main' into tg/support-provider-id-format-of-upstream-ccm

Author: guettli

controllers/hcloudremediation_controller_test.go

@@ -204,15 +204,15 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 			})
 		})
 
-		It("checks that no remediation is tried if HCloud server does not exist anymore", func() {
+		It("checks that no remediation is tried if HCloud server does not exist anymore (flaky)", func() {
 			By("ensuring if hcloudMachine is provisioned")
 			Eventually(func() error {
 				if err := testEnv.Get(ctx, hcloudMachineKey, hcloudMachine); err != nil {
 					return err
 				}
 
 				if !hcloudMachine.Status.Ready {
-					return fmt.Errorf("hcloudMachine.Status.Ready is not true (yet)")
+					return fmt.Errorf("hcloudMachine.Status.Ready is not true (yet) (flaky)")
 				}
 				return nil
 			}, timeout).ShouldNot(HaveOccurred())