Skip to content

✨ Add feature-set annotation to all manifest resources #2073

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

Merged
merged 1 commit into from
Jul 3, 2025
Merged

✨ Add feature-set annotation to all manifest resources #2073

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
2 changes: 1 addition & 1 deletion config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/overlays/basic-olm/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions config/overlays/experimental-e2e/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/overlays/experimental/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/overlays/standard-e2e/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/overlays/standard/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/overlays/tilt-local-dev/catalogd/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/overlays/tilt-local-dev/operator-controller/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions hack/tools/crd-generator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion ...rd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ls/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading