diff --git a/internal/controller/cephfscg/cghandler.go b/internal/controller/cephfscg/cghandler.go index 2c9fea72c..fcc11836d 100644 --- a/internal/controller/cephfscg/cghandler.go +++ b/internal/controller/cephfscg/cghandler.go @@ -11,7 +11,6 @@ import ( "github.com/go-logr/logr" snapv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" ramendrv1alpha1 "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" "github.com/ramendr/ramen/internal/controller/util" "github.com/ramendr/ramen/internal/controller/volsync" corev1 "k8s.io/api/core/v1" @@ -119,7 +118,7 @@ func (c *cgHandler) CreateOrUpdateReplicationGroupDestination( }, } - core.ObjectCreatedByRamenSetLabel(rgd) + util.AddLabel(rgd, util.CreatedByRamenLabel, "true") _, err := ctrlutil.CreateOrUpdate(c.ctx, c.Client, rgd, func() error { if err := ctrl.SetControllerReference(c.instance, rgd, c.Client.Scheme()); err != nil { @@ -207,7 +206,7 @@ func (c *cgHandler) CreateOrUpdateReplicationGroupSource( }, } - core.ObjectCreatedByRamenSetLabel(rgs) + util.AddLabel(rgs, util.CreatedByRamenLabel, "true") _, err = ctrlutil.CreateOrUpdate(c.ctx, c.Client, rgs, func() error { if err := ctrl.SetControllerReference(c.instance, rgs, c.Client.Scheme()); err != nil { diff --git a/internal/controller/cephfscg/replicationgroupdestination.go b/internal/controller/cephfscg/replicationgroupdestination.go index 48738fe82..ab3ebacc4 100644 --- a/internal/controller/cephfscg/replicationgroupdestination.go +++ b/internal/controller/cephfscg/replicationgroupdestination.go @@ -13,7 +13,6 @@ import ( "github.com/backube/volsync/controllers/statemachine" "github.com/go-logr/logr" ramendrv1alpha1 "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" "github.com/ramendr/ramen/internal/controller/util" "github.com/ramendr/ramen/internal/controller/volsync" corev1 "k8s.io/api/core/v1" @@ -264,7 +263,7 @@ func (m *rgdMachine) CreateReplicationDestinations( } util.AddLabel(rd, util.RGDOwnerLabel, m.ReplicationGroupDestination.Name) - core.ObjectCreatedByRamenSetLabel(rd) + util.AddLabel(rd, util.CreatedByRamenLabel, "true") util.AddAnnotation(rd, volsync.OwnerNameAnnotation, m.ReplicationGroupDestination.Name) util.AddAnnotation(rd, volsync.OwnerNamespaceAnnotation, m.ReplicationGroupDestination.Namespace) diff --git a/internal/controller/cephfscg/volumegroupsourcehandler.go b/internal/controller/cephfscg/volumegroupsourcehandler.go index e954afbb8..8225ec094 100644 --- a/internal/controller/cephfscg/volumegroupsourcehandler.go +++ b/internal/controller/cephfscg/volumegroupsourcehandler.go @@ -13,7 +13,6 @@ import ( vgsv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" ramendrv1alpha1 "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" "github.com/ramendr/ramen/internal/controller/util" "github.com/ramendr/ramen/internal/controller/volsync" @@ -127,7 +126,7 @@ func (h *volumeGroupSourceHandler) CreateOrUpdateVolumeGroupSnapshot( return err } - core.ObjectCreatedByRamenSetLabel(volumeGroupSnapshot) + util.AddLabel(volumeGroupSnapshot, util.CreatedByRamenLabel, "true") util.AddLabel(volumeGroupSnapshot, util.RGSOwnerLabel, owner.GetName()) util.AddAnnotation(volumeGroupSnapshot, volsync.OwnerNameAnnotation, owner.GetName()) util.AddAnnotation(volumeGroupSnapshot, volsync.OwnerNamespaceAnnotation, owner.GetNamespace()) @@ -356,7 +355,7 @@ func (h *volumeGroupSourceHandler) RestoreVolumesFromSnapshot( return err } - core.ObjectCreatedByRamenSetLabel(restoredPVC) + util.AddLabel(restoredPVC, util.CreatedByRamenLabel, "true") util.AddLabel(restoredPVC, util.RGSOwnerLabel, owner.GetName()) util.AddAnnotation(restoredPVC, volsync.OwnerNameAnnotation, owner.GetName()) util.AddAnnotation(restoredPVC, volsync.OwnerNamespaceAnnotation, owner.GetNamespace()) @@ -451,7 +450,7 @@ func (h *volumeGroupSourceHandler) CreateOrUpdateReplicationSourceForRestoredPVC return err } - core.ObjectCreatedByRamenSetLabel(replicationSource) + util.AddLabel(replicationSource, util.CreatedByRamenLabel, "true") util.AddLabel(replicationSource, util.RGSOwnerLabel, owner.GetName()) util.AddAnnotation(replicationSource, volsync.OwnerNameAnnotation, owner.GetName()) util.AddAnnotation(replicationSource, volsync.OwnerNamespaceAnnotation, owner.GetNamespace()) diff --git a/internal/controller/core/labels.go b/internal/controller/core/labels.go deleted file mode 100644 index e455bb75b..000000000 --- a/internal/controller/core/labels.go +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-FileCopyrightText: The RamenDR authors -// SPDX-License-Identifier: Apache-2.0 - -package core - -import ( - "sigs.k8s.io/controller-runtime/pkg/client" -) - -const ( - CreatedByRamenLabel = "ramendr.openshift.io/resource-created-by-ramen" -) - -func ObjectCreatedByRamenSetLabel(object client.Object) { - labels := object.GetLabels() - if labels == nil { - labels = make(map[string]string) - } - - labels[CreatedByRamenLabel] = "true" - object.SetLabels(labels) -} diff --git a/internal/controller/drcluster_controller.go b/internal/controller/drcluster_controller.go index b9bcae0ce..66ceab2e2 100644 --- a/internal/controller/drcluster_controller.go +++ b/internal/controller/drcluster_controller.go @@ -32,7 +32,6 @@ import ( csiaddonsv1alpha1 "github.com/csi-addons/kubernetes-csi-addons/api/csiaddons/v1alpha1" "github.com/go-logr/logr" ramen "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" "github.com/ramendr/ramen/internal/controller/util" ) @@ -678,7 +677,7 @@ func (u *drclusterInstance) generateDRClusterConfig() (*ramen.DRClusterConfig, e }, } - core.ObjectCreatedByRamenSetLabel(&drcConfig) + util.AddLabel(&drcConfig, util.CreatedByRamenLabel, "true") drpolicies, err := util.GetAllDRPolicies(u.ctx, u.reconciler.APIReader) if err != nil { @@ -1465,7 +1464,7 @@ func generateNF(targetCluster *ramen.DRCluster) (csiaddonsv1alpha1.NetworkFence, Cidrs: targetCluster.Spec.CIDRs, }, } - core.ObjectCreatedByRamenSetLabel(&nf) + util.AddLabel(&nf, util.CreatedByRamenLabel, "true") if err := fillStorageDetails(targetCluster, &nf); err != nil { return nf, fmt.Errorf("failed to create network fence resource with storage detai: %w", err) diff --git a/internal/controller/drplacementcontrol.go b/internal/controller/drplacementcontrol.go index 1b60b9494..68da79171 100644 --- a/internal/controller/drplacementcontrol.go +++ b/internal/controller/drplacementcontrol.go @@ -21,7 +21,6 @@ import ( clrapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1" rmn "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" rmnutil "github.com/ramendr/ramen/internal/controller/util" "sigs.k8s.io/controller-runtime/pkg/client" @@ -1881,7 +1880,7 @@ func (d *DRPCInstance) newVRG( }, } - core.ObjectCreatedByRamenSetLabel(&vrg) + rmnutil.AddLabel(&vrg, rmnutil.CreatedByRamenLabel, "true") d.updateVRGOptionalFields(&vrg, vrgFromView, dstCluster) diff --git a/internal/controller/drplacementcontrol_controller.go b/internal/controller/drplacementcontrol_controller.go index 44ba0af1f..ff154a100 100644 --- a/internal/controller/drplacementcontrol_controller.go +++ b/internal/controller/drplacementcontrol_controller.go @@ -14,7 +14,7 @@ import ( "github.com/go-logr/logr" "github.com/google/uuid" - recipecore "github.com/ramendr/ramen/internal/controller/core" + core "github.com/ramendr/ramen/internal/controller/core" plrv1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -1097,7 +1097,7 @@ func (r *DRPlacementControlReconciler) clonePlacementRule(ctx context.Context, clonedPlRule := &plrv1.PlacementRule{} - recipecore.ObjectCreatedByRamenSetLabel(clonedPlRule) + rmnutil.AddLabel(clonedPlRule, rmnutil.CreatedByRamenLabel, "true") userPlRule.DeepCopyInto(clonedPlRule) @@ -1709,7 +1709,7 @@ func (r *DRPlacementControlReconciler) createPlacementDecision(ctx context.Conte rmnutil.ExcludeFromVeleroBackup: "true", } - recipecore.ObjectCreatedByRamenSetLabel(plDecision) + rmnutil.AddLabel(plDecision, rmnutil.CreatedByRamenLabel, "true") owner := metav1.NewControllerRef(placement, clrapiv1beta1.GroupVersion.WithKind("Placement")) plDecision.ObjectMeta.OwnerReferences = []metav1.OwnerReference{*owner} @@ -2526,7 +2526,7 @@ func (r *DRPlacementControlReconciler) drpcProtectVMInNS(drpc *rmn.DRPlacementCo // Both the DRPCs are associated with vm-recipe, and protecting VM resources. // Support for protecting independent VMs - if drpcRecipeName == recipecore.VMRecipeName && otherDrpcRecipeName == recipecore.VMRecipeName { + if drpcRecipeName == core.VMRecipeName && otherDrpcRecipeName == core.VMRecipeName { ramenOpsNS := RamenOperandsNamespace(*ramenConfig) if drpc.Spec.KubeObjectProtection.RecipeRef.Namespace == ramenOpsNS && @@ -2542,8 +2542,8 @@ func (r *DRPlacementControlReconciler) twoVMDRPCsConflict(drpc *rmn.DRPlacementC otherdrpc *rmn.DRPlacementControl, ) bool { // "PROTECTED_VMS" - drpcVMList := sets.NewString(drpc.Spec.KubeObjectProtection.RecipeParameters[recipecore.VMList]...) - otherdrpcVMList := sets.NewString(otherdrpc.Spec.KubeObjectProtection.RecipeParameters[recipecore.VMList]...) + drpcVMList := sets.NewString(drpc.Spec.KubeObjectProtection.RecipeParameters[core.VMList]...) + otherdrpcVMList := sets.NewString(otherdrpc.Spec.KubeObjectProtection.RecipeParameters[core.VMList]...) vmListConflict := drpcVMList.Intersection(otherdrpcVMList) @@ -2551,16 +2551,16 @@ func (r *DRPlacementControlReconciler) twoVMDRPCsConflict(drpc *rmn.DRPlacementC // "K8S_RESOURCE_LIST" drpcK8SLabelSelector := sets.NewString( - drpc.Spec.KubeObjectProtection.RecipeParameters[recipecore.K8SLabelSelector]...) + drpc.Spec.KubeObjectProtection.RecipeParameters[core.K8SLabelSelector]...) otherdrpcK8SLabelSelector := sets.NewString( - otherdrpc.Spec.KubeObjectProtection.RecipeParameters[recipecore.K8SLabelSelector]...) + otherdrpc.Spec.KubeObjectProtection.RecipeParameters[core.K8SLabelSelector]...) k8sLabelSelectorConflict := drpcK8SLabelSelector.Intersection(otherdrpcK8SLabelSelector) // "PVC_RESOURCE_LIST" drpcPVCLabelSelector := sets.NewString( - drpc.Spec.KubeObjectProtection.RecipeParameters[recipecore.PVCLabelSelector]...) + drpc.Spec.KubeObjectProtection.RecipeParameters[core.PVCLabelSelector]...) otherdrpcPVCLabelSelector := sets.NewString( - otherdrpc.Spec.KubeObjectProtection.RecipeParameters[recipecore.PVCLabelSelector]...) + otherdrpc.Spec.KubeObjectProtection.RecipeParameters[core.PVCLabelSelector]...) pvcLabelSelectorConflict := drpcPVCLabelSelector.Intersection(otherdrpcPVCLabelSelector) diff --git a/internal/controller/kubeobjects/velero/requests.go b/internal/controller/kubeobjects/velero/requests.go index 64fd48fb7..5aa9d1f2c 100644 --- a/internal/controller/kubeobjects/velero/requests.go +++ b/internal/controller/kubeobjects/velero/requests.go @@ -16,8 +16,8 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/ramendr/ramen/internal/controller/core" "github.com/ramendr/ramen/internal/controller/kubeobjects" + "github.com/ramendr/ramen/internal/controller/util" velero "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -469,7 +469,7 @@ func backupRequestCreate( labels, ) - core.ObjectCreatedByRamenSetLabel(backupLocation) + util.AddLabel(backupLocation, util.CreatedByRamenLabel, "true") if err := w.objectCreate(backupLocation); err != nil { return backupLocation, nil, err diff --git a/internal/controller/util/mcv_util.go b/internal/controller/util/mcv_util.go index e3f2566cc..b548e2e8f 100644 --- a/internal/controller/util/mcv_util.go +++ b/internal/controller/util/mcv_util.go @@ -21,7 +21,6 @@ import ( csiaddonsv1alpha1 "github.com/csi-addons/kubernetes-csi-addons/api/csiaddons/v1alpha1" rmn "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" viewv1beta1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/view/v1beta1" ctrl "sigs.k8s.io/controller-runtime" ) @@ -423,7 +422,7 @@ func (m ManagedClusterViewGetterImpl) getOrCreateManagedClusterView( }, } - core.ObjectCreatedByRamenSetLabel(mcv) + AddLabel(mcv, CreatedByRamenLabel, "true") err := m.Get(context.TODO(), key, mcv) if err != nil { diff --git a/internal/controller/util/misc.go b/internal/controller/util/misc.go index d4e6ba429..084cb0f4a 100644 --- a/internal/controller/util/misc.go +++ b/internal/controller/util/misc.go @@ -10,7 +10,6 @@ import ( "reflect" rmn "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -32,6 +31,8 @@ const ( JobNameMaxLength = validation.DNS1123LabelMaxLength ServiceNameMaxLength = validation.DNS1123LabelMaxLength + + CreatedByRamenLabel = "ramendr.openshift.io/created-by-ramen" ) type ResourceUpdater struct { @@ -232,7 +233,7 @@ func CreateNamespaceIfNotExists(ctx context.Context, k8sClient client.Client, na if err != nil { if k8serrors.IsNotFound(err) { ns.Name = namespace - core.ObjectCreatedByRamenSetLabel(ns) + AddLabel(ns, CreatedByRamenLabel, "true") err = k8sClient.Create(ctx, ns) if err != nil { diff --git a/internal/controller/util/mw_util.go b/internal/controller/util/mw_util.go index 1b251d8ff..2cb642353 100644 --- a/internal/controller/util/mw_util.go +++ b/internal/controller/util/mw_util.go @@ -25,7 +25,6 @@ import ( csiaddonsv1alpha1 "github.com/csi-addons/kubernetes-csi-addons/api/csiaddons/v1alpha1" rmn "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) @@ -595,7 +594,7 @@ func (mwu *MWUtil) newManifestWork(name string, mcNamespace string, }, } - core.ObjectCreatedByRamenSetLabel(mw) + AddLabel(mw, CreatedByRamenLabel, "true") if annotations != nil { mw.ObjectMeta.Annotations = annotations diff --git a/internal/controller/util/secrets_util.go b/internal/controller/util/secrets_util.go index 7b463e782..0ccad945d 100644 --- a/internal/controller/util/secrets_util.go +++ b/internal/controller/util/secrets_util.go @@ -13,7 +13,6 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/ramendr/ramen/internal/controller/core" plrv1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -296,7 +295,7 @@ func newS3ConfigurationSecret(s3SecretRef corev1.SecretReference, targetns strin }, } - core.ObjectCreatedByRamenSetLabel(localsecret) + AddLabel(localsecret, CreatedByRamenLabel, "true") return localsecret } @@ -330,7 +329,7 @@ func newVeleroSecret(s3SecretRef corev1.SecretReference, fromNS, veleroNS, keyNa }, } - core.ObjectCreatedByRamenSetLabel(localsecret) + AddLabel(localsecret, CreatedByRamenLabel, "true") return localsecret } @@ -411,7 +410,7 @@ func (sutil *SecretsUtil) createPolicyResources( } plRuleBindingObject := newPlacementRuleBinding(plBindingName, namespace, plRuleName, subjects) - core.ObjectCreatedByRamenSetLabel(plRuleBindingObject) + AddLabel(plRuleBindingObject, CreatedByRamenLabel, "true") if err := sutil.Client.Create(sutil.Ctx, plRuleBindingObject); err != nil && !k8serrors.IsAlreadyExists(err) { sutil.Log.Error(err, "unable to create placement binding", "secret", secret.Name, "cluster", cluster) @@ -422,13 +421,13 @@ func (sutil *SecretsUtil) createPolicyResources( // Create a Policy object for the secret configObject := newConfigurationPolicy(configPolicyName, sutil.policyObject(secret.Name, namespace, targetNS, format, veleroNS)) - core.ObjectCreatedByRamenSetLabel(configObject) + AddLabel(configObject, CreatedByRamenLabel, "true") sutil.Log.Info("Initializing secret policy trigger", "secret", secret.Name, "trigger", secret.ResourceVersion) policyObject := newPolicy(policyName, namespace, secret.ResourceVersion, runtime.RawExtension{Object: configObject}) - core.ObjectCreatedByRamenSetLabel(policyObject) + AddLabel(policyObject, CreatedByRamenLabel, "true") if err := sutil.Client.Create(sutil.Ctx, policyObject); err != nil && !k8serrors.IsAlreadyExists(err) { sutil.Log.Error(err, "unable to create policy", "secret", secret.Name, "cluster", cluster) @@ -438,7 +437,7 @@ func (sutil *SecretsUtil) createPolicyResources( // Create a PlacementRule, including cluster plRuleObject := newPlacementRule(plRuleName, namespace, []string{cluster}) - core.ObjectCreatedByRamenSetLabel(plRuleObject) + AddLabel(plRuleObject, CreatedByRamenLabel, "true") if err := sutil.Client.Create(sutil.Ctx, plRuleObject); err != nil && !k8serrors.IsAlreadyExists(err) { sutil.Log.Error(err, "unable to create placement rule", "secret", secret.Name, "cluster", cluster) diff --git a/internal/controller/volsync/deploy_volsync.go b/internal/controller/volsync/deploy_volsync.go index 9036c4e02..c1e49513e 100644 --- a/internal/controller/volsync/deploy_volsync.go +++ b/internal/controller/volsync/deploy_volsync.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/ramendr/ramen/internal/controller/core" + "github.com/ramendr/ramen/internal/controller/util" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" @@ -58,7 +58,7 @@ func reconcileVolSyncManagedClusterAddOn(ctx context.Context, k8sClient client.C Version: ManagedClusterAddOnVersion, Kind: ManagedClusterAddOnKind, }) - core.ObjectCreatedByRamenSetLabel(vsMCAO) + util.AddLabel(vsMCAO, util.CreatedByRamenLabel, "true") op, err := ctrlutil.CreateOrUpdate(ctx, k8sClient, vsMCAO, func() error { // Do not update the ManagedClusterAddOn if it already exists - let users update settings if required diff --git a/internal/controller/volsync/secret_propagator.go b/internal/controller/volsync/secret_propagator.go index 48531df09..6a09e5814 100644 --- a/internal/controller/volsync/secret_propagator.go +++ b/internal/controller/volsync/secret_propagator.go @@ -16,7 +16,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/ramendr/ramen/internal/controller/core" "github.com/ramendr/ramen/internal/controller/util" plrulev1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1" cfgpolicyv1 "open-cluster-management.io/config-policy-controller/api/v1" @@ -168,7 +167,7 @@ func (sp *secretPropagator) reconcileSecretPropagationPolicy() error { }, } - core.ObjectCreatedByRamenSetLabel(policy) + util.AddLabel(policy, util.CreatedByRamenLabel, "true") op, err := ctrlutil.CreateOrUpdate(sp.Context, sp.Client, policy, func() error { if err := ctrl.SetControllerReference(sp.Owner, policy, sp.Client.Scheme()); err != nil { @@ -262,7 +261,7 @@ func (sp *secretPropagator) reconcileSecretPropagationPlacementRule() error { }, } - core.ObjectCreatedByRamenSetLabel(placementRule) + util.AddLabel(placementRule, util.CreatedByRamenLabel, "true") clustersToApply := []plrulev1.GenericClusterReference{} for _, clusterName := range sp.DestClusters { @@ -309,7 +308,7 @@ func (sp *secretPropagator) reconcileSecretPropagationPlacementBinding() error { }, } - core.ObjectCreatedByRamenSetLabel(placementBinding) + util.AddLabel(placementBinding, util.CreatedByRamenLabel, "true") op, err := ctrlutil.CreateOrUpdate(sp.Context, sp.Client, placementBinding, func() error { if err := ctrl.SetControllerReference(sp.Owner, placementBinding, sp.Client.Scheme()); err != nil { diff --git a/internal/controller/volsync/secretgen.go b/internal/controller/volsync/secretgen.go index abe6ce6c8..ad2b0a907 100644 --- a/internal/controller/volsync/secretgen.go +++ b/internal/controller/volsync/secretgen.go @@ -10,7 +10,6 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/ramendr/ramen/internal/controller/core" rmnutil "github.com/ramendr/ramen/internal/controller/util" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -86,7 +85,7 @@ func generateNewVolSyncReplicationSecret(secretName, secretNamespace string, log }, } - core.ObjectCreatedByRamenSetLabel(secret) + rmnutil.AddLabel(secret, rmnutil.CreatedByRamenLabel, "true") return secret, nil } diff --git a/internal/controller/volsync/vshandler.go b/internal/controller/volsync/vshandler.go index f2a85b79e..187c64347 100644 --- a/internal/controller/volsync/vshandler.go +++ b/internal/controller/volsync/vshandler.go @@ -29,7 +29,6 @@ import ( volsyncv1alpha1 "github.com/backube/volsync/api/v1alpha1" ramendrv1alpha1 "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" "github.com/ramendr/ramen/internal/controller/util" ) @@ -225,7 +224,7 @@ func (v *VSHandler) createOrUpdateRD( }, } - core.ObjectCreatedByRamenSetLabel(rd) + util.AddLabel(rd, util.CreatedByRamenLabel, "true") op, err := ctrlutil.CreateOrUpdate(v.ctx, v.client, rd, func() error { if !v.vrgInAdminNamespace { @@ -451,7 +450,7 @@ func (v *VSHandler) createOrUpdateRS(rsSpec ramendrv1alpha1.VolSyncReplicationSo }, } - core.ObjectCreatedByRamenSetLabel(rs) + util.AddLabel(rs, util.CreatedByRamenLabel, "true") // Handle final sync by retaining the PV and creating a tmpPVC used for final sync stop := v.setupForFinalSync(&rsSpec, runFinalSync) @@ -1414,7 +1413,7 @@ func (v *VSHandler) EnsurePVCforDirectCopy(ctx context.Context, }, } - core.ObjectCreatedByRamenSetLabel(pvc) + util.AddLabel(pvc, util.CreatedByRamenLabel, "true") op, err := ctrlutil.CreateOrUpdate(ctx, v.client, pvc, func() error { if !v.vrgInAdminNamespace { @@ -1582,7 +1581,7 @@ func (v *VSHandler) ensurePVCFromSnapshot(rdSpec ramendrv1alpha1.VolSyncReplicat }, } - core.ObjectCreatedByRamenSetLabel(pvc) + util.AddLabel(pvc, util.CreatedByRamenLabel, "true") pvcRequestedCapacity := rdSpec.ProtectedPVC.Resources.Requests.Storage() if snapRestoreSize != nil { @@ -2145,7 +2144,7 @@ func (v *VSHandler) reconcileLocalRD(rdSpec ramendrv1alpha1.VolSyncReplicationDe } } - core.ObjectCreatedByRamenSetLabel(lrd) + util.AddLabel(lrd, util.CreatedByRamenLabel, "true") util.AddLabel(lrd, VRGOwnerNameLabel, v.owner.GetName()) util.AddLabel(lrd, VRGOwnerNamespaceLabel, v.owner.GetNamespace()) util.AddLabel(lrd, VolSyncDoNotDeleteLabel, VolSyncDoNotDeleteLabelVal) @@ -2219,7 +2218,7 @@ func (v *VSHandler) reconcileLocalRS(rd *volsyncv1alpha1.ReplicationDestination, } } - core.ObjectCreatedByRamenSetLabel(lrs) + util.AddLabel(lrs, util.CreatedByRamenLabel, "true") util.AddLabel(lrs, VRGOwnerNameLabel, v.owner.GetName()) util.AddLabel(lrs, VRGOwnerNamespaceLabel, v.owner.GetNamespace()) @@ -2369,7 +2368,7 @@ func (v *VSHandler) createPVCFromSnapshot(rd *volsyncv1alpha1.ReplicationDestina }, } - core.ObjectCreatedByRamenSetLabel(pvc) + util.AddLabel(pvc, util.CreatedByRamenLabel, "true") pvcRequestedCapacity := rd.Spec.RsyncTLS.Capacity if snapRestoreSize != nil { diff --git a/internal/controller/vrg_volrep.go b/internal/controller/vrg_volrep.go index 498f2695f..96f7b9f97 100644 --- a/internal/controller/vrg_volrep.go +++ b/internal/controller/vrg_volrep.go @@ -23,7 +23,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ramendrv1alpha1 "github.com/ramendr/ramen/api/v1alpha1" - "github.com/ramendr/ramen/internal/controller/core" rmnutil "github.com/ramendr/ramen/internal/controller/util" ) @@ -1285,7 +1284,7 @@ func (v *VRGInstance) createVR(vrNamespacedName types.NamespacedName, state volr }, } - core.ObjectCreatedByRamenSetLabel(volRep) + rmnutil.AddLabel(volRep, rmnutil.CreatedByRamenLabel, "true") if !vrgInAdminNamespace(v.instance, v.ramenConfig) { // This is to keep existing behavior of ramen.