Add backup label for BMH and DataImage

Author: carbonin

controllers/imageclusterinstall_controller.go

@@ -774,6 +774,7 @@ func (r *ImageClusterInstallReconciler) ensureBMHDataImage(
 	if err != nil {
 		return dataImage, ctrl.Result{}, fmt.Errorf("failed to set controller reference for dataImage due to %w", err)
 	}
+	setBackupLabel(dataImage)
 
 	err = r.Create(ctx, dataImage)
 	if err != nil {
@@ -905,6 +906,32 @@ func (r *ImageClusterInstallReconciler) labelSecretForBackup(ctx context.Context
 	return nil
 }
 
+func (r *ImageClusterInstallReconciler) labelBMHForBackup(ctx context.Context, bmhRef *v1alpha1.BareMetalHostReference) error {
+	bmh, err := r.getBMH(ctx, bmhRef)
+	if err != nil {
+		return err
+	}
+
+	patch := client.MergeFrom(bmh.DeepCopy())
+	if setBackupLabel(bmh) {
+		return r.Patch(ctx, bmh, patch)
+	}
+	return nil
+}
+
+func (r *ImageClusterInstallReconciler) labelDataImageForBackup(ctx context.Context, bmhRef *v1alpha1.BareMetalHostReference) error {
+	dataImage, err := r.getDataImage(ctx, bmhRef.Namespace, bmhRef.Name)
+	if err != nil {
+		return err
+	}
+
+	patch := client.MergeFrom(dataImage.DeepCopy())
+	if setBackupLabel(dataImage) {
+		return r.Patch(ctx, dataImage, patch)
+	}
+	return nil
+}
+
 func (r *ImageClusterInstallReconciler) labelReferencedObjectsForBackup(ctx context.Context, log logrus.FieldLogger, ici *v1alpha1.ImageClusterInstall, cd *hivev1.ClusterDeployment) {
 	if ici.Spec.ClusterMetadata != nil {
 		kubeconfigKey := types.NamespacedName{Name: ici.Spec.ClusterMetadata.AdminKubeconfigSecretRef.Name, Namespace: ici.Namespace}
@@ -939,6 +966,16 @@ func (r *ImageClusterInstallReconciler) labelReferencedObjectsForBackup(ctx cont
 			log.WithError(err).Errorf("failed to label Secret %s for backup", psKey)
 		}
 	}
+
+	if ici.Spec.BareMetalHostRef != nil {
+		if err := r.labelBMHForBackup(ctx, ici.Spec.BareMetalHostRef); err != nil {
+			log.WithError(err).Errorf("failed to label BMH %s/%s for backup", ici.Spec.BareMetalHostRef.Namespace, ici.Spec.BareMetalHostRef.Name)
+		}
+
+		if err := r.labelDataImageForBackup(ctx, ici.Spec.BareMetalHostRef); err != nil {
+			log.WithError(err).Errorf("failed to label DataImage %s/%s for backup", ici.Spec.BareMetalHostRef.Namespace, ici.Spec.BareMetalHostRef.Name)
+		}
+	}
 }
 
 func (r *ImageClusterInstallReconciler) configDirs(ici *v1alpha1.ImageClusterInstall) (string, string, error) {

controllers/imageclusterinstall_controller_test.go

@@ -2116,6 +2116,97 @@ var _ = Describe("Reconcile", func() {
 		}
 	})
 
+	It("labels BMH and DataImage for backup", func() {
+		bmh := bmhInState(bmh_v1alpha1.StateAvailable)
+		bmh.Spec.Online = true
+		bmh.Spec.ExternallyProvisioned = false
+		Expect(c.Create(ctx, bmh)).To(Succeed())
+
+		clusterInstall.Spec.BareMetalHostRef = &v1alpha1.BareMetalHostReference{
+			Name:      bmh.Name,
+			Namespace: bmh.Namespace,
+		}
+		Expect(c.Create(ctx, clusterInstall)).To(Succeed())
+		clusterDeployment.Spec.ClusterName = "test"
+		clusterDeployment.Spec.BaseDomain = "example.com"
+		Expect(c.Create(ctx, clusterDeployment)).To(Succeed())
+
+		// Create DataImage beforehand so it exists when backup labeling happens
+		dataImage := &bmh_v1alpha1.DataImage{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      bmh.Name,
+				Namespace: bmh.Namespace,
+			},
+			Spec: bmh_v1alpha1.DataImageSpec{
+				URL: imageURL(),
+			},
+		}
+		Expect(c.Create(ctx, dataImage)).To(Succeed())
+
+		key := types.NamespacedName{
+			Namespace: clusterInstallNamespace,
+			Name:      clusterInstallName,
+		}
+		installerSuccess()
+		res, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: key})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(res).To(Equal(ctrl.Result{}))
+
+		// Verify BMH has backup label
+		bmhKey := types.NamespacedName{
+			Namespace: bmh.Namespace,
+			Name:      bmh.Name,
+		}
+		testBMH := &bmh_v1alpha1.BareMetalHost{}
+		Expect(c.Get(ctx, bmhKey, testBMH)).To(Succeed())
+		Expect(testBMH.GetLabels()).To(HaveKeyWithValue(backupLabel, backupLabelValue), "BMH %s/%s missing backup label", testBMH.Namespace, testBMH.Name)
+
+		// Verify DataImage has backup label
+		testDataImage := &bmh_v1alpha1.DataImage{}
+		Expect(c.Get(ctx, bmhKey, testDataImage)).To(Succeed())
+		Expect(testDataImage.GetLabels()).To(HaveKeyWithValue(backupLabel, backupLabelValue), "DataImage %s/%s missing backup label", testDataImage.Namespace, testDataImage.Name)
+	})
+
+	It("labels newly created DataImage for backup", func() {
+		bmh := bmhInState(bmh_v1alpha1.StateAvailable)
+		bmh.Spec.Online = true
+		bmh.Spec.ExternallyProvisioned = false
+		Expect(c.Create(ctx, bmh)).To(Succeed())
+
+		clusterInstall.Spec.BareMetalHostRef = &v1alpha1.BareMetalHostReference{
+			Name:      bmh.Name,
+			Namespace: bmh.Namespace,
+		}
+		Expect(c.Create(ctx, clusterInstall)).To(Succeed())
+		clusterDeployment.Spec.ClusterName = "test"
+		clusterDeployment.Spec.BaseDomain = "example.com"
+		Expect(c.Create(ctx, clusterDeployment)).To(Succeed())
+
+		key := types.NamespacedName{
+			Namespace: clusterInstallNamespace,
+			Name:      clusterInstallName,
+		}
+		installerSuccess()
+		// First reconcile creates the DataImage
+		res, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: key})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(res).To(Equal(ctrl.Result{}))
+
+		// Verify BMH has backup label
+		bmhKey := types.NamespacedName{
+			Namespace: bmh.Namespace,
+			Name:      bmh.Name,
+		}
+		testBMH := &bmh_v1alpha1.BareMetalHost{}
+		Expect(c.Get(ctx, bmhKey, testBMH)).To(Succeed())
+		Expect(testBMH.GetLabels()).To(HaveKeyWithValue(backupLabel, backupLabelValue), "BMH %s/%s missing backup label", testBMH.Namespace, testBMH.Name)
+
+		// Verify newly created DataImage has backup label
+		testDataImage := &bmh_v1alpha1.DataImage{}
+		Expect(c.Get(ctx, bmhKey, testDataImage)).To(Succeed())
+		Expect(testDataImage.GetLabels()).To(HaveKeyWithValue(backupLabel, backupLabelValue), "DataImage %s/%s missing backup label", testDataImage.Namespace, testDataImage.Name)
+	})
+
 	Context("when the cluster identity secrets exist", func() {
 		createSecret := func(name string, data map[string][]byte) {
 			s := corev1.Secret{