Skip to content

Ramen label follow-up changes #2024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Ramen label follow-up changes #2024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions internal/controller/cephfscg/cghandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions internal/controller/cephfscg/replicationgroupdestination.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)

Expand Down
7 changes: 3 additions & 4 deletions internal/controller/cephfscg/volumegroupsourcehandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down
22 changes: 0 additions & 22 deletions internal/controller/core/labels.go
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions internal/controller/drcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions internal/controller/drplacementcontrol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1881,7 +1880,7 @@ func (d *DRPCInstance) newVRG(
},
}

core.ObjectCreatedByRamenSetLabel(&vrg)
rmnutil.AddLabel(&vrg, rmnutil.CreatedByRamenLabel, "true")

d.updateVRGOptionalFields(&vrg, vrgFromView, dstCluster)

Expand Down
20 changes: 10 additions & 10 deletions internal/controller/drplacementcontrol_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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 &&
Expand All @@ -2542,25 +2542,25 @@ 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)

// Mark the latest drpc as unavailable if conflicting resources found

// "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)

Expand Down
4 changes: 2 additions & 2 deletions internal/controller/kubeobjects/velero/requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions internal/controller/util/mcv_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions internal/controller/util/misc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -32,6 +31,8 @@ const (

JobNameMaxLength = validation.DNS1123LabelMaxLength
ServiceNameMaxLength = validation.DNS1123LabelMaxLength

CreatedByRamenLabel = "ramendr.openshift.io/created-by-ramen"
)

type ResourceUpdater struct {
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions internal/controller/util/mw_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down
13 changes: 6 additions & 7 deletions internal/controller/util/secrets_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -296,7 +295,7 @@ func newS3ConfigurationSecret(s3SecretRef corev1.SecretReference, targetns strin
},
}

core.ObjectCreatedByRamenSetLabel(localsecret)
AddLabel(localsecret, CreatedByRamenLabel, "true")

return localsecret
}
Expand Down Expand Up @@ -330,7 +329,7 @@ func newVeleroSecret(s3SecretRef corev1.SecretReference, fromNS, veleroNS, keyNa
},
}

core.ObjectCreatedByRamenSetLabel(localsecret)
AddLabel(localsecret, CreatedByRamenLabel, "true")

return localsecret
}
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/volsync/deploy_volsync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Loading