Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ status:
resource: nodes
- group: "certificates.k8s.io"
resource: "certificatesigningrequests"
- group: "rbac.authorization.k8s.io"
name: "system:openshift:operator:kube-controller-manager-operator"
resource: "clusterrolebindings"
Copy link
Member

Choose a reason for hiding this comment

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

The CVO will only apply these if it sees this manifest when the ClusterOperator doesn't exist. That means these won't get injected into existing clusters updating into this new code. Do you not reconcile these as part of your Go controller's ClusterOperator status management? Or does this manifest somehow also feed your Go controller? Or...?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right, I will mark this as WIP and research it a bit more.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added the record into the status management as well, this should be now resolved.

1 change: 1 addition & 0 deletions pkg/operator/starter.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ func RunOperator(ctx context.Context, cc *controllercmd.ControllerContext) error
// TODO move to a more appropriate operator. One that creates and manages these.
{Resource: "nodes"},
{Group: "config.openshift.io", Resource: "nodes", Name: "cluster"},
{Group: "rbac.authorization.k8s.io", Resource: "clusterrolebindings", Name: "system:openshift:operator:kube-controller-manager-operator"},
},
configClient.ConfigV1(),
configInformers.Config().V1().ClusterOperators(),
Expand Down