LOG-1713: fix prometheus roles to be namespaced scoped

[jcantrill]

Description

This PR:

• Fixes the prometheus roles to be namespace scoped

Links

• https://issues.redhat.com/browse/LOG-1713

[periklis]

LGTM, but did you forget to generate the bundle maybe?

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [jcantrill]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[jcantrill]

LGTM, but did you forget to generate the bundle maybe?

Ran make target but it appears it updated files outside of the changes I was targeting

[periklis]

One more thing, you need to ensure that you manual delete the old clusterrole and clusterrolebinding from the bundle and manifests dir.

[periklis]

LGTM, but did you forget to generate the bundle maybe?

Ran make target but it appears it updated files outside of the changes I was targeting

Looks like people don't treat the bundle dir with care.

[jcantrill]

One more thing, you need to ensure that you manual delete the old clusterrole and clusterrolebinding from the bundle and manifests dir.

@periklis I believe this change does accomplish removing those roles/bindings. Existing deployments I do not believe will be updated to remove them. I think this change also moves us one step closer to being able to remove the manifest directory

[jcantrill]

/hold

[jcantrill]

/hold cancel

[periklis]

One more thing, you need to ensure that you manual delete the old clusterrole and clusterrolebinding from the bundle and manifests dir.

@periklis I believe this change does accomplish removing those roles/bindings. Existing deployments I do not believe will be updated to remove them. I think this change also moves us one step closer to being able to remove the manifest directory

Nope the make bundle command does not remove the ClusterRole and ClusterRoleBinding files at all. At the current SHA1 for this PR, the file still exists: https://github.com/openshift/cluster-logging-operator/blob/ba4354322a6be05457b25543af1752462bad2a24/bundle/manifests/cluster-logging-metadata-reader_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml

[jcantrill]

One more thing, you need to ensure that you manual delete the old clusterrole and clusterrolebinding from the bundle and manifests dir.

@periklis I believe this change does accomplish removing those roles/bindings. Existing deployments I do not believe will be updated to remove them. I think this change also moves us one step closer to being able to remove the manifest directory

Nope the make bundle command does not remove the ClusterRole and ClusterRoleBinding files at all. At the current SHA1 for this PR, the file still exists: https://github.com/openshift/cluster-logging-operator/blob/ba4354322a6be05457b25543af1752462bad2a24/bundle/manifests/cluster-logging-metadata-reader_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml

This is the role the collector uses to talk to the API server, not for prometheus to scrap the collector. Interestingly though I wonder if we can reduce it to a namespaces role or if you require clusterwide in order to get pod meta from any pod across the cluster

[jcantrill]

/retest

[jcantrill]

/retest

[jcantrill]

/retest

[vimalk78]

/lgtm

[openshift-ci]

@jcantrill: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[jcantrill]

/cherrypick release-5.4

[openshift-cherrypick-robot]

@jcantrill: #1383 failed to apply on top of branch "release-5.4":

Applying: LOG-1713: fix prometheus roles to be namespaced scoped
.git/rebase-apply/patch:330: trailing whitespace.
  namespace: openshift-monitoring 
.git/rebase-apply/patch:495: trailing whitespace.
  namespace: openshift-monitoring 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	bundle/manifests/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
M	config/rbac/kustomization.yaml
A	manifests/5.5/0100_clusterroles.yaml
A	manifests/5.5/0110_clusterrolebindings.yaml
A	manifests/5.5/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
A	manifests/5.5/logging.openshift.io_clusterlogforwarders_crd.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/5.4/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
CONFLICT (rename/rename): Rename "manifests/5.5/0110_clusterrolebindings.yaml"->"manifests/5.4/0110_clusterrolebindings.yaml" in branch "HEAD" rename "manifests/5.5/0110_clusterrolebindings.yaml"->"bundle/manifests/prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml" in "LOG-1713: fix prometheus roles to be namespaced scoped"
CONFLICT (rename/rename): Rename "manifests/5.5/0100_clusterroles.yaml"->"manifests/5.4/0100_clusterroles.yaml" in branch "HEAD" rename "manifests/5.5/0100_clusterroles.yaml"->"config/rbac/prometheus_role.yaml" in "LOG-1713: fix prometheus roles to be namespaced scoped"
Auto-merging config/rbac/kustomization.yaml
CONFLICT (content): Merge conflict in config/rbac/kustomization.yaml
Auto-merging bundle/manifests/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-1713: fix prometheus roles to be namespaced scoped
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-5.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.