Skip to content

OCPBUGS-65488: Add cluster-scoped RBAC and CRDs to network ClusterOperator relatedObjects #3013

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

Open
smulje wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −0
Open

OCPBUGS-65488: Add cluster-scoped RBAC and CRDs to network ClusterOperator relatedObjects #3013

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
16 changes: 16 additions & 0 deletions manifests/0000_70_cluster-network-operator_05_clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/single-node-developer: "true"
status:
relatedObjects:

@arghosh93 arghosh93 Jun 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why you are adding here and also adding at operconfig_controller.go? We should never set status at the manifest I think.

- group: rbac.authorization.k8s.io
resource: clusterrolebindings
name: cluster-network-operator
- group: rbac.authorization.k8s.io
resource: clusterrolebindings
name: default-account-cluster-network-operator
- group: apiextensions.k8s.io
resource: customresourcedefinitions
name: egressrouters.network.operator.openshift.io
- group: apiextensions.k8s.io
resource: customresourcedefinitions
name: operatorpkis.network.operator.openshift.io
- group: apiextensions.k8s.io
resource: customresourcedefinitions
name: networks.operator.openshift.io
Comment thread
coderabbitai[bot] marked this conversation as resolved.
versions:
- name: operator
version: "0.0.1-snapshot"
32 changes: 32 additions & 0 deletions pkg/controller/operconfig/operconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,38 @@ func (r *ReconcileOperConfig) Reconcile(ctx context.Context, request reconcile.R
Name: "openshift-cloud-network-config-controller",
})

// Add cluster-scoped RBAC resources from static manifests
relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: "rbac.authorization.k8s.io",
Resource: "clusterrolebindings",
Name: "cluster-network-operator",
})

relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: "rbac.authorization.k8s.io",
Resource: "clusterrolebindings",
Name: "default-account-cluster-network-operator",
})

// Add CRDs from static manifests
relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: "apiextensions.k8s.io",
Resource: "customresourcedefinitions",
Name: "egressrouters.network.operator.openshift.io",
})

relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: "apiextensions.k8s.io",
Resource: "customresourcedefinitions",
Name: "operatorpkis.network.operator.openshift.io",
})

relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: "apiextensions.k8s.io",
Resource: "customresourcedefinitions",
Name: "networks.operator.openshift.io",
})

r.status.SetRelatedObjects(relatedObjects)
r.status.SetRelatedClusterObjects(relatedClusterObjects)
err = r.status.SetMachineConfigs(ctx, renderedMachineConfigs)
Expand Down