Skip to content

🐛 fix: missing olm.operatorNamespace annotation #2803

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
openshift-merge-bot merged 1 commit into from
Jul 6, 2026
Merged

🐛 fix: missing olm.operatorNamespace annotation #2803

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
8 changes: 6 additions & 2 deletions internal/operator-controller/rukpak/render/registryv1/generators/generators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ var certVolumeConfigs = []certVolumeConfig{
// BundleCSVDeploymentGenerator generates all deployments defined in rv1's cluster service version (CSV). The generated
// resource aim to have parity with OLMv0 generated Deployment resources:
// - olm.targetNamespaces annotation is set with the opts.TargetNamespace value
// - olm.operatorNamespace annotation is set with the opts.InstallNamespace value
// - the deployment spec's revision history limit is set to 1
// - merges csv annotations to the deployment template's annotations
func BundleCSVDeploymentGenerator(rv1 *bundle.RegistryV1, opts render.Options) ([]client.Object, error) {
Expand All @@ -78,10 +79,13 @@ func BundleCSVDeploymentGenerator(rv1 *bundle.RegistryV1, opts render.Options) (
// See https://github.com/operator-framework/operator-lifecycle-manager/blob/dfd0b2bea85038d3c0d65348bc812d297f16b8d2/pkg/controller/install/deployment.go#L142
annotations := util.MergeMaps(rv1.CSV.Annotations, depSpec.Spec.Template.Annotations)

// In OLMv0 CSVs are annotated with the OperatorGroup's .spec.targetNamespaces
// In OLMv0, CSVs are annotated with OperatorGroup information:
// - olm.targetNamespaces: the OperatorGroup's .spec.targetNamespaces
// - olm.operatorNamespace: the namespace where the OperatorGroup is defined (operator's install namespace)
// See https://github.com/operator-framework/operator-lifecycle-manager/blob/dfd0b2bea85038d3c0d65348bc812d297f16b8d2/pkg/controller/operators/olm/operatorgroup.go#L279
// When the CSVs annotations are copied to the deployment template's annotations, they bring with it this annotation
// When the CSVs annotations are copied to the deployment template's annotations, they bring with it these annotations
annotations["olm.targetNamespaces"] = strings.Join(opts.TargetNamespaces, ",")
annotations["olm.operatorNamespace"] = opts.InstallNamespace
depSpec.Spec.Template.Annotations = annotations

// Hardcode the deployment with RevisionHistoryLimit=1 to maintain parity with OLMv0 behaviour.
Expand Down
12 changes: 7 additions & 5 deletions internal/operator-controller/rukpak/render/registryv1/generators/generators_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ func Test_BundleCSVDeploymentGenerator_Succeeds(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"csv": "annotation",
"olm.targetNamespaces": "watch-namespace-one,watch-namespace-two",
"pod": "annotation",
"csv": "annotation",
"olm.targetNamespaces": "watch-namespace-one,watch-namespace-two",
"olm.operatorNamespace": "install-namespace",
"pod": "annotation",
},
},
Spec: corev1.PodSpec{
Expand All @@ -148,8 +149,9 @@ func Test_BundleCSVDeploymentGenerator_Succeeds(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"csv": "annotation",
"olm.targetNamespaces": "watch-namespace-one,watch-namespace-two",
"csv": "annotation",
"olm.targetNamespaces": "watch-namespace-one,watch-namespace-two",
"olm.operatorNamespace": "install-namespace",
},
},
},
Expand Down
1 change: 1 addition & 0 deletions ...gocd-operator.v0.6.0/all-namespaces/11_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ spec:
containerImage: quay.io/argoprojlabs/argocd-operator@sha256:99aeec24cc406d06d18822347d9ac3ed053a702d8419191e4e681075fed7b9bb
description: Argo CD is a declarative, GitOps continuous delivery tool for
Kubernetes.
olm.operatorNamespace: argocd-system
olm.targetNamespaces: ""
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
1 change: 1 addition & 0 deletions ...rgocd-operator.v0.6.0/own-namespace/09_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ spec:
containerImage: quay.io/argoprojlabs/argocd-operator@sha256:99aeec24cc406d06d18822347d9ac3ed053a702d8419191e4e681075fed7b9bb
description: Argo CD is a declarative, GitOps continuous delivery tool for
Kubernetes.
olm.operatorNamespace: argocd-system
olm.targetNamespaces: argocd-system
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
1 change: 1 addition & 0 deletions ...cd-operator.v0.6.0/single-namespace/09_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ spec:
containerImage: quay.io/argoprojlabs/argocd-operator@sha256:99aeec24cc406d06d18822347d9ac3ed053a702d8419191e4e681075fed7b9bb
description: Argo CD is a declarative, GitOps continuous delivery tool for
Kubernetes.
olm.operatorNamespace: argocd-system
olm.targetNamespaces: argocd-watch
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
1 change: 1 addition & 0 deletions ...0.6.0/with-deploymentconfig-options/11_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ spec:
description: Argo CD is a declarative, GitOps continuous delivery tool for
Kubernetes.
foo: bar
olm.operatorNamespace: argocd-system
olm.targetNamespaces: ""
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
1 change: 1 addition & 0 deletions ....v0.6.0/with-empty-affinity-subtype/11_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ spec:
containerImage: quay.io/argoprojlabs/argocd-operator@sha256:99aeec24cc406d06d18822347d9ac3ed053a702d8419191e4e681075fed7b9bb
description: Argo CD is a declarative, GitOps continuous delivery tool for
Kubernetes.
olm.operatorNamespace: argocd-system
olm.targetNamespaces: ""
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
1 change: 1 addition & 0 deletions ...operator.v0.6.0/with-empty-affinity/11_deployment_argocd-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ spec:
containerImage: quay.io/argoprojlabs/argocd-operator@sha256:99aeec24cc406d06d18822347d9ac3ed053a702d8419191e4e681075fed7b9bb
description: Argo CD is a declarative, GitOps continuous delivery tool for
Kubernetes.
olm.operatorNamespace: argocd-system
olm.targetNamespaces: ""
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
1 change: 1 addition & 0 deletions ...-operator.v0.0.5/all-webhook-types/05_deployment_webhook-operator-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ spec:
]
capabilities: Basic Install
kubectl.kubernetes.io/default-container: manager
olm.operatorNamespace: webhook-system
olm.targetNamespaces: ""
operators.operatorframework.io/builder: operator-sdk-v1.41.1
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
Expand Down
Loading