search

openshift / cluster-monitoring-operator

Manage the OpenShift monitoring stack
Apache License 2.0
247 stars 363 forks source link

AUTH-482: set required-scc for openshift workloads #2335

Closed liouk closed 5 months ago

liouk commented 5 months ago

This PR sets the required SCC explicitly on each workload in openshift-* namespaces. The SCC chosen is the one that the pods are getting admitted with, so no change expected there. This is to protect the pods from getting admitted with a different custom SCC than the one intended.

This PR

openshift-ci-robot commented 5 months ago

@liouk: This pull request references AUTH-482 which is a valid jira issue.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2335): >* [ ] I added CHANGELOG entry for this change. >* [x] No user facing changes, so no entry in CHANGELOG was needed. > >This PR sets the required SCC explicitly on each workload in `openshift-*` namespaces. The SCC chosen is the one that the pods are getting admitted with, so no change expected there. This is to protect the pods from getting admitted with a different custom SCC than the one intended. > >This PR >- updates `manifests/` >- updates any workloads defined in `jsonnet/` >- generates new manifests in `assets/` based on jsonnet changes Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci[bot] commented 5 months ago

@liouk: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/versions bb1c14ff3416df6a35ef5f9d866d240a783627be link false /test versions

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-ci[bot] commented 5 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liouk, simonpasquier

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](https://github.com/openshift/cluster-monitoring-operator/blob/master/OWNERS)~~ [simonpasquier] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-bot commented 5 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-monitoring-operator-container-v4.16.0-202405030917.p0.gf7eb1eb.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.

ShazaAldawamneh commented 4 days ago

/cherry-pick release-4.17

openshift-cherrypick-robot commented 4 days ago

@ShazaAldawamneh: #2335 failed to apply on top of branch "release-4.17":

Applying: set required-scc for openshift workloads
Using index info to reconstruct a base tree...
M   assets/admission-webhook/deployment.yaml
M   assets/alertmanager/alertmanager.yaml
M   assets/kube-state-metrics/deployment.yaml
M   assets/monitoring-plugin/deployment.yaml
M   assets/node-exporter/daemonset.yaml
M   assets/openshift-state-metrics/deployment.yaml
A   assets/prometheus-adapter/deployment.yaml
M   assets/prometheus-k8s/prometheus.yaml
M   assets/prometheus-operator-user-workload/deployment.yaml
M   assets/prometheus-operator/deployment.yaml
M   assets/prometheus-user-workload/prometheus.yaml
M   assets/telemeter-client/deployment.yaml
M   assets/thanos-querier/deployment.yaml
M   assets/thanos-ruler/thanos-ruler.yaml
M   jsonnet/components/admission-webhook.libsonnet
M   jsonnet/components/alertmanager.libsonnet
M   jsonnet/components/kube-state-metrics.libsonnet
M   jsonnet/components/monitoring-plugin.libsonnet
M   jsonnet/components/node-exporter.libsonnet
M   jsonnet/components/openshift-state-metrics.libsonnet
A   jsonnet/components/prometheus-adapter.libsonnet
M   jsonnet/components/prometheus-operator-user-workload.libsonnet
M   jsonnet/components/prometheus-operator.libsonnet
M   jsonnet/components/prometheus-user-workload.libsonnet
M   jsonnet/components/prometheus.libsonnet
M   jsonnet/components/telemeter-client.libsonnet
M   jsonnet/components/thanos-querier.libsonnet
M   jsonnet/components/thanos-ruler.libsonnet
M   manifests/0000_50_cluster-monitoring-operator_05-deployment-ibm-cloud-managed.yaml
M   manifests/0000_50_cluster-monitoring-operator_05-deployment.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/0000_50_cluster-monitoring-operator_05-deployment.yaml
Auto-merging manifests/0000_50_cluster-monitoring-operator_05-deployment-ibm-cloud-managed.yaml
Auto-merging jsonnet/components/thanos-ruler.libsonnet
Auto-merging jsonnet/components/thanos-querier.libsonnet
Auto-merging jsonnet/components/telemeter-client.libsonnet
Auto-merging jsonnet/components/prometheus.libsonnet
Auto-merging jsonnet/components/prometheus-user-workload.libsonnet
Auto-merging jsonnet/components/prometheus-operator.libsonnet
Auto-merging jsonnet/components/prometheus-operator-user-workload.libsonnet
CONFLICT (modify/delete): jsonnet/components/prometheus-adapter.libsonnet deleted in HEAD and modified in set required-scc for openshift workloads. Version set required-scc for openshift workloads of jsonnet/components/prometheus-adapter.libsonnet left in tree.
Auto-merging jsonnet/components/openshift-state-metrics.libsonnet
Auto-merging jsonnet/components/node-exporter.libsonnet
CONFLICT (content): Merge conflict in jsonnet/components/node-exporter.libsonnet
Auto-merging jsonnet/components/monitoring-plugin.libsonnet
Auto-merging jsonnet/components/kube-state-metrics.libsonnet
Auto-merging jsonnet/components/alertmanager.libsonnet
Auto-merging jsonnet/components/admission-webhook.libsonnet
Auto-merging assets/thanos-ruler/thanos-ruler.yaml
Auto-merging assets/thanos-querier/deployment.yaml
Auto-merging assets/telemeter-client/deployment.yaml
Auto-merging assets/prometheus-user-workload/prometheus.yaml
Auto-merging assets/prometheus-operator/deployment.yaml
Auto-merging assets/prometheus-operator-user-workload/deployment.yaml
Auto-merging assets/prometheus-k8s/prometheus.yaml
CONFLICT (modify/delete): assets/prometheus-adapter/deployment.yaml deleted in HEAD and modified in set required-scc for openshift workloads. Version set required-scc for openshift workloads of assets/prometheus-adapter/deployment.yaml left in tree.
Auto-merging assets/openshift-state-metrics/deployment.yaml
Auto-merging assets/node-exporter/daemonset.yaml
Auto-merging assets/kube-state-metrics/deployment.yaml
Auto-merging assets/alertmanager/alertmanager.yaml
Auto-merging assets/admission-webhook/deployment.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 set required-scc for openshift workloads
In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2335#issuecomment-2416413170): > >/cherry-pick release-4.17 > > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.