Add feature-set annotation to all manifest resources (#2073)

tmshort · web-flow · commit ee0d23261a55 · 2025-07-03T15:50:48.000-04:00
The feature-set annotation was originally applied by the crd-generator
to the generated CRDs. Now, that annotaion is being added by the overlay,
and is being added to all resources in the manifest.

Each manifest has an annotation value based its name.

The crd-generator is now adding a generated annotation indicating what
the CRD was generated for.

Signed-off-by: Todd Short &lt;tshort@redhat.com&gt;
diff --git a/config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml b/config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    olm.operatorframework.io/feature-set: experimental
+    olm.operatorframework.io/generated: experimental
   name: clustercatalogs.olm.operatorframework.io
 spec:
   group: olm.operatorframework.io
diff --git a/config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml b/config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    olm.operatorframework.io/feature-set: standard
+    olm.operatorframework.io/generated: standard
   name: clustercatalogs.olm.operatorframework.io
 spec:
   group: olm.operatorframework.io
diff --git a/config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml b/config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    olm.operatorframework.io/feature-set: experimental
+    olm.operatorframework.io/generated: experimental
   name: clusterextensions.olm.operatorframework.io
 spec:
   group: olm.operatorframework.io
diff --git a/config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml b/config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    olm.operatorframework.io/feature-set: standard
+    olm.operatorframework.io/generated: standard
   name: clusterextensions.olm.operatorframework.io
 spec:
   group: olm.operatorframework.io
diff --git a/config/overlays/basic-olm/kustomization.yaml b/config/overlays/basic-olm/kustomization.yaml
@@ -2,5 +2,7 @@
 # DO NOT ADD A NAMESPACE HERE
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: basic-olm
 components:
 - ../../components/base/standard
diff --git a/config/overlays/experimental-e2e/kustomization.yaml b/config/overlays/experimental-e2e/kustomization.yaml
@@ -2,6 +2,8 @@
 # DO NOT ADD A NAMESPACE HERE
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: experimental
 components:
 - ../../components/base/experimental
 - ../../components/e2e
diff --git a/config/overlays/experimental/kustomization.yaml b/config/overlays/experimental/kustomization.yaml
@@ -2,6 +2,8 @@
 # DO NOT ADD A NAMESPACE HERE
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: experimental
 components:
 - ../../components/base/experimental
 # This must be last due to namespace overwrite issues of the ca
diff --git a/config/overlays/standard-e2e/kustomization.yaml b/config/overlays/standard-e2e/kustomization.yaml
@@ -2,6 +2,8 @@
 # DO NOT ADD A NAMESPACE HERE
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: standard-e2e
 components:
 - ../../components/base/standard
 - ../../components/e2e
diff --git a/config/overlays/standard/kustomization.yaml b/config/overlays/standard/kustomization.yaml
@@ -2,6 +2,8 @@
 # DO NOT ADD A NAMESPACE HERE
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: standard
 components:
 - ../../components/base/standard
 # This must be last due to namespace overwrite issues of the ca
diff --git a/config/overlays/tilt-local-dev/catalogd/kustomization.yaml b/config/overlays/tilt-local-dev/catalogd/kustomization.yaml
@@ -2,6 +2,8 @@
 # DO NOT ADD A NAMESPACE HERE
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: tilt
 resources:
 - ../../../base/catalogd
 - ../../../base/common
diff --git a/config/overlays/tilt-local-dev/operator-controller/kustomization.yaml b/config/overlays/tilt-local-dev/operator-controller/kustomization.yaml
@@ -2,6 +2,8 @@
 # DO NOT ADD A NAMESPACE HERE
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonAnnotations:
+  olm.operatorframework.io/feature-set: tilt
 resources:
 - ../../../base/operator-controller
 - ../../../base/common
diff --git a/hack/tools/crd-generator/main.go b/hack/tools/crd-generator/main.go
@@ -35,10 +35,10 @@ import (
 const (
 	// FeatureSetAnnotation is the annotation key used in the Operator-Controller API CRDs to specify
 	// the installed Operator-Controller API channel.
-	FeatureSetAnnotation = "olm.operatorframework.io/feature-set"
-	VersionAnnotation    = "controller-gen.kubebuilder.io/version"
-	StandardChannel      = "standard"
-	ExperimentalChannel  = "experimental"
+	GeneratorAnnotation = "olm.operatorframework.io/generated"
+	VersionAnnotation   = "controller-gen.kubebuilder.io/version"
+	StandardChannel     = "standard"
+	ExperimentalChannel = "experimental"
 )
 
 var standardKinds = map[string]bool{
@@ -123,7 +123,7 @@ func runGenerator(args ...string) {
 			if crdRaw.Annotations == nil {
 				crdRaw.Annotations = map[string]string{}
 			}
-			crdRaw.Annotations[FeatureSetAnnotation] = channel
+			crdRaw.Annotations[GeneratorAnnotation] = channel
 			if ctVer != "" {
 				crdRaw.Annotations[VersionAnnotation] = ctVer
 			}
diff --git a/hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml b/hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    olm.operatorframework.io/feature-set: experimental
+    olm.operatorframework.io/generated: experimental
   name: clusterextensions.olm.operatorframework.io
 spec:
   group: olm.operatorframework.io
diff --git a/hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml b/hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
-    olm.operatorframework.io/feature-set: standard
+    olm.operatorframework.io/generated: standard
   name: clusterextensions.olm.operatorframework.io
 spec:
   group: olm.operatorframework.io
diff --git a/manifests/experimental-e2e.yaml b/manifests/experimental-e2e.yaml
diff --git a/manifests/experimental.yaml b/manifests/experimental.yaml
diff --git a/manifests/standard-e2e.yaml b/manifests/standard-e2e.yaml
diff --git a/manifests/standard.yaml b/manifests/standard.yaml
