Skip to content

OCPBUGS-65469: Add all managed resources to ClusterOperator relatedObjects #459

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
RadekManak wants to merge 2 commits into
base: main
Choose a base branch
from
+181 −5
Open

OCPBUGS-65469: Add all managed resources to ClusterOperator relatedObjects #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
169a201
Add ClusterRole to ClusterOperator relatedObjects
RadekManak Nov 12, 2025
f418143
Expand ClusterOperator relatedObjects to all managed resources
RadekManak May 6, 2026
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
144 changes: 142 additions & 2 deletions manifests/0000_26_cloud-controller-manager-operator_12_clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,148 @@ status:
name: cloud-controller-manager
resource: clusteroperators
- group: ""
name: openshift-cloud-controller-manager
name: openshift-cloud-controller-manager-operator
resource: namespaces
- group: ""
name: openshift-cloud-controller-manager-operator
name: openshift-cloud-controller-manager
resource: namespaces
- group: ""
name: cloud-controller-manager-images
namespace: openshift-cloud-controller-manager-operator
resource: configmaps
- group: ""
name: kube-rbac-proxy
namespace: openshift-cloud-controller-manager-operator
resource: configmaps
- group: ""
name: cloud-controller-manager-operator
namespace: openshift-cloud-controller-manager-operator
resource: services
- group: apps
name: cluster-cloud-controller-manager-operator
namespace: openshift-cloud-controller-manager-operator
resource: deployments
- group: networking.k8s.io
name: default-deny
namespace: openshift-cloud-controller-manager-operator
resource: networkpolicies
- group: networking.k8s.io
name: ""
namespace: openshift-cloud-controller-manager
resource: networkpolicies
- group: ""
name: cluster-cloud-controller-manager
namespace: openshift-cloud-controller-manager-operator
resource: serviceaccounts
- group: ""
name: ""
namespace: openshift-cloud-controller-manager
resource: serviceaccounts
- group: ""
name: cloud-controller-manager
namespace: kube-system
resource: serviceaccounts
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: openshift-cloud-controller-manager-operator
resource: roles
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: openshift-config
resource: roles
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: openshift-config-managed
resource: roles
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: kube-system
resource: roles
- group: rbac.authorization.k8s.io
name: ""
namespace: openshift-cloud-controller-manager
resource: roles
- group: rbac.authorization.k8s.io
name: cloud-controller-manager
namespace: kube-system
resource: roles
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: openshift-cloud-controller-manager-operator
resource: rolebindings
- group: rbac.authorization.k8s.io
name: ""
namespace: openshift-cloud-controller-manager
resource: rolebindings
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: openshift-config
resource: rolebindings
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: openshift-config-managed
resource: rolebindings
- group: rbac.authorization.k8s.io
name: cluster-cloud-controller-manager
namespace: kube-system
resource: rolebindings
- group: rbac.authorization.k8s.io
name: cloud-controller-manager
namespace: kube-system
resource: rolebindings
- group: rbac.authorization.k8s.io
name: cloud-controller-manager:apiserver-authentication-reader
namespace: kube-system
resource: rolebindings
- group: rbac.authorization.k8s.io
name: system:openshift:operator:cloud-controller-manager
resource: clusterroles
- group: rbac.authorization.k8s.io
name: cloud-controller-manager
resource: clusterroles
- group: rbac.authorization.k8s.io
name: cloud-node-manager
resource: clusterroles
- group: rbac.authorization.k8s.io
name: openstack-cloud-controller-manager
resource: clusterroles
- group: rbac.authorization.k8s.io
name: system:openshift:operator:cloud-controller-manager
resource: clusterrolebindings
- group: rbac.authorization.k8s.io
name: cloud-controller-manager
resource: clusterrolebindings
- group: rbac.authorization.k8s.io
name: cloud-node-manager
resource: clusterrolebindings
- group: rbac.authorization.k8s.io
name: openstack-cloud-controller-manager
resource: clusterrolebindings
- group: cloudcredential.openshift.io
name: openshift-azure-cloud-controller-manager
namespace: openshift-cloud-credential-operator
resource: credentialsrequests
- group: cloudcredential.openshift.io
name: openshift-gcp-ccm
namespace: openshift-cloud-credential-operator
resource: credentialsrequests
- group: cloudcredential.openshift.io
name: openshift-ibm-cloud-controller-manager
namespace: openshift-cloud-credential-operator
resource: credentialsrequests
- group: cloudcredential.openshift.io
name: openshift-nutanix-cloud-controller-manager
namespace: openshift-cloud-credential-operator
resource: credentialsrequests
- group: cloudcredential.openshift.io
name: openshift-openstack-cloud-controller-manager
namespace: openshift-cloud-credential-operator
resource: credentialsrequests
- group: cloudcredential.openshift.io
name: openshift-powervs-cloud-controller-manager
namespace: openshift-cloud-credential-operator
resource: credentialsrequests
- group: cloudcredential.openshift.io
name: openshift-vsphere-cloud-controller-manager
namespace: openshift-cloud-credential-operator
resource: credentialsrequests
42 changes: 39 additions & 3 deletions pkg/controllers/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,47 @@ func (r *ClusterOperatorStatusClient) getOrCreateClusterOperator(ctx context.Con
}

func (r *ClusterOperatorStatusClient) relatedObjects() []configv1.ObjectReference {
// TBD: Add an actual set of object references from getResources method
return []configv1.ObjectReference{
{Resource: "namespaces", Name: defaultManagementNamespace},
{Group: configv1.GroupName, Resource: "clusteroperators", Name: clusterOperatorName},
{Resource: "namespaces", Name: r.ManagedNamespace},
{Group: "", Resource: "namespaces", Name: defaultManagementNamespace},
{Group: "", Resource: "namespaces", Name: r.ManagedNamespace},
{Group: "", Resource: "configmaps", Name: "cloud-controller-manager-images", Namespace: defaultManagementNamespace},
{Group: "", Resource: "configmaps", Name: "kube-rbac-proxy", Namespace: defaultManagementNamespace},
{Group: "", Resource: "services", Name: "cloud-controller-manager-operator", Namespace: defaultManagementNamespace},
{Group: "apps", Resource: "deployments", Name: "cluster-cloud-controller-manager-operator", Namespace: defaultManagementNamespace},
{Group: "networking.k8s.io", Resource: "networkpolicies", Name: "default-deny", Namespace: defaultManagementNamespace},
{Group: "networking.k8s.io", Resource: "networkpolicies", Name: "", Namespace: r.ManagedNamespace},
{Group: "", Resource: "serviceaccounts", Name: "cluster-cloud-controller-manager", Namespace: defaultManagementNamespace},
{Group: "", Resource: "serviceaccounts", Name: "", Namespace: r.ManagedNamespace},
{Group: "", Resource: "serviceaccounts", Name: "cloud-controller-manager", Namespace: "kube-system"},
{Group: "rbac.authorization.k8s.io", Resource: "roles", Name: "cluster-cloud-controller-manager", Namespace: defaultManagementNamespace},
{Group: "rbac.authorization.k8s.io", Resource: "roles", Name: "cluster-cloud-controller-manager", Namespace: "openshift-config"},
{Group: "rbac.authorization.k8s.io", Resource: "roles", Name: "cluster-cloud-controller-manager", Namespace: "openshift-config-managed"},
{Group: "rbac.authorization.k8s.io", Resource: "roles", Name: "cluster-cloud-controller-manager", Namespace: "kube-system"},
{Group: "rbac.authorization.k8s.io", Resource: "roles", Name: "", Namespace: r.ManagedNamespace},
{Group: "rbac.authorization.k8s.io", Resource: "roles", Name: "cloud-controller-manager", Namespace: "kube-system"},
{Group: "rbac.authorization.k8s.io", Resource: "rolebindings", Name: "cluster-cloud-controller-manager", Namespace: defaultManagementNamespace},
{Group: "rbac.authorization.k8s.io", Resource: "rolebindings", Name: "", Namespace: r.ManagedNamespace},
{Group: "rbac.authorization.k8s.io", Resource: "rolebindings", Name: "cluster-cloud-controller-manager", Namespace: "openshift-config"},
{Group: "rbac.authorization.k8s.io", Resource: "rolebindings", Name: "cluster-cloud-controller-manager", Namespace: "openshift-config-managed"},
{Group: "rbac.authorization.k8s.io", Resource: "rolebindings", Name: "cluster-cloud-controller-manager", Namespace: "kube-system"},
{Group: "rbac.authorization.k8s.io", Resource: "rolebindings", Name: "cloud-controller-manager", Namespace: "kube-system"},
{Group: "rbac.authorization.k8s.io", Resource: "rolebindings", Name: "cloud-controller-manager:apiserver-authentication-reader", Namespace: "kube-system"},
{Group: "rbac.authorization.k8s.io", Resource: "clusterroles", Name: "system:openshift:operator:" + clusterOperatorName},
{Group: "rbac.authorization.k8s.io", Resource: "clusterroles", Name: clusterOperatorName},
{Group: "rbac.authorization.k8s.io", Resource: "clusterroles", Name: "cloud-node-manager"},
{Group: "rbac.authorization.k8s.io", Resource: "clusterroles", Name: "openstack-cloud-controller-manager"},
{Group: "rbac.authorization.k8s.io", Resource: "clusterrolebindings", Name: "system:openshift:operator:" + clusterOperatorName},
{Group: "rbac.authorization.k8s.io", Resource: "clusterrolebindings", Name: clusterOperatorName},
{Group: "rbac.authorization.k8s.io", Resource: "clusterrolebindings", Name: "cloud-node-manager"},
{Group: "rbac.authorization.k8s.io", Resource: "clusterrolebindings", Name: "openstack-cloud-controller-manager"},
{Group: "cloudcredential.openshift.io", Resource: "credentialsrequests", Name: "openshift-azure-cloud-controller-manager", Namespace: "openshift-cloud-credential-operator"},
{Group: "cloudcredential.openshift.io", Resource: "credentialsrequests", Name: "openshift-gcp-ccm", Namespace: "openshift-cloud-credential-operator"},
{Group: "cloudcredential.openshift.io", Resource: "credentialsrequests", Name: "openshift-ibm-cloud-controller-manager", Namespace: "openshift-cloud-credential-operator"},
{Group: "cloudcredential.openshift.io", Resource: "credentialsrequests", Name: "openshift-nutanix-cloud-controller-manager", Namespace: "openshift-cloud-credential-operator"},
{Group: "cloudcredential.openshift.io", Resource: "credentialsrequests", Name: "openshift-openstack-cloud-controller-manager", Namespace: "openshift-cloud-credential-operator"},
{Group: "cloudcredential.openshift.io", Resource: "credentialsrequests", Name: "openshift-powervs-cloud-controller-manager", Namespace: "openshift-cloud-credential-operator"},
{Group: "cloudcredential.openshift.io", Resource: "credentialsrequests", Name: "openshift-vsphere-cloud-controller-manager", Namespace: "openshift-cloud-credential-operator"},
}
}

Expand Down