Merge pull request #124 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: cb9ea0032c95d59d8a4951593f6486ae6c03c0bb
+expectedMergeBase: baac660980549ef68329cd72b45906ddefa7f3c2
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

internal/labels/labels.go

@@ -1,13 +1,9 @@
 package labels
 
 const (
-	OwnerKindKey = "olm.operatorframework.io/owner-kind"
-	OwnerNameKey = "olm.operatorframework.io/owner-name"
-
-	// Helm Secret annotations use the regex `(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?`
-	// to validate labels. Which is why a similar format as OwnerKindKey/OwnerNameKey
-	// cannot be used as they do not conform to the regex requirements.
-	PackageNameKey   = "olm_operatorframework_io_package_name"
-	BundleNameKey    = "olm_operatorframework_io_bundle_name"
-	BundleVersionKey = "olm_operatorframework_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"
 )