⚠️ Update owner keys (#765)

* Update owner keys

Signed-off-by: Todd Short <[email protected]>

* fixup! Update owner keys

Signed-off-by: Todd Short <[email protected]>

---------

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

internal/controllers/clusterextension_controller.go

@@ -231,11 +231,11 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 
 	post := &postrenderer{
 		labels: map[string]string{
-			util.CoreOwnerKindKey:          ocv1alpha1.ClusterExtensionKind,
-			util.CoreOwnerNameKey:          ext.GetName(),
-			util.ResolvedbundleName:        bundle.Name,
-			util.ResolvedbundlePackageName: bundle.Package,
-			util.ResolvedbundleVersion:     bundleVersion.String(),
+			util.OwnerKindKey:     ocv1alpha1.ClusterExtensionKind,
+			util.OwnerNameKey:     ext.GetName(),
+			util.BundleNameKey:    bundle.Name,
+			util.PackageNameKey:   bundle.Package,
+			util.BundleVersionKey: bundleVersion.String(),
 		},
 	}
 
@@ -636,7 +636,7 @@ func (r *ClusterExtensionReconciler) getInstalledVersion(clusterExtension ocv1al
 	}
 
 	// TODO: when the chart is created these annotations are to be added.
-	existingVersion, ok := chart.Metadata.Annotations[util.ResolvedbundleVersion]
+	existingVersion, ok := chart.Metadata.Annotations[util.BundleVersionKey]
 	if !ok {
 		return nil, fmt.Errorf("chart %q: missing bundle version", chart.Name())
 	}

internal/rukpak/source/image.go

@@ -119,8 +119,8 @@ func (i *Image) getDesiredPodApplyConfig(bs *rukpakapi.BundleSource, ce *cluster
 	// These references need to be based on ClusterExtension...
 	podApply := applyconfigurationcorev1.Pod(ce.Name, i.PodNamespace).
 		WithLabels(map[string]string{
-			util.CoreOwnerKindKey: ce.Kind,
-			util.CoreOwnerNameKey: ce.Name,
+			util.OwnerKindKey: ce.Kind,
+			util.OwnerNameKey: ce.Name,
 		}).
 		WithOwnerReferences(v1.OwnerReference().
 			WithName(ce.Name).

internal/rukpak/util/labels.go

@@ -1,10 +1,9 @@
 package util
 
 const (
-	CoreOwnerKindKey          = "core.clusterextension.io/owner-kind"
-	CoreOwnerNameKey          = "core.clusterextension.io/owner-name"
-	ResolvedBundleCatalogID   = "core.clusterextension.io/catalog-id"
-	ResolvedbundlePackageName = "core.clusterextension.io/package-name"
-	ResolvedbundleName        = "core.clusterextension.io/bundle-name"
-	ResolvedbundleVersion     = "core.clusterextension.io/bundle-version"
+	OwnerKindKey     = "olm.operatorframework.io/owner-kind"
+	OwnerNameKey     = "olm.operatorframework.io/owner-name"
+	PackageNameKey   = "olm.operatorframework.io/package-name"
+	BundleNameKey    = "olm.operatorframework.io/bundle-name"
+	BundleVersionKey = "olm.operatorframework.io/bundle-version"
 )