Skip to content

OU-1389: config path to point to correct directory#2981

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
PeterYurkovich:fix-config-path
Jul 8, 2026
Merged

OU-1389: config path to point to correct directory#2981
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
PeterYurkovich:fix-config-path

Conversation

@PeterYurkovich

@PeterYurkovich PeterYurkovich commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

This PR is part of a set that looks to update the monitoring-plugin to be feature driven, allowing for each feature to be toggled on or off individually. This conversion will happen over the course of the following PRs:

  1. This PR, which fixes CMO to pass the correct config directory to the monitoring-plugin so that the *.patch.json feature files are able to be loaded correctly
  2. Change the monitoring-plugin backend to be feature driven and handle no feature flags so that the current monitoring-plugin features are enabled (OU-1389: swap monitoring-plugin to be feature driven monitoring-plugin#1034) for backwards compatability
  3. Change CMO to directly pass in the alerting, targets, metrics and legacy-dashboards feature flags to the monitoring-plugin. Ensure the TestClusterMonitorConsolePlugin test still passes
  4. Adjust the monitoring-plugin to serve no features is no feature flags are passed in

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 6, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

@PeterYurkovich: This pull request references OU-1137 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

This PR looks to update the monitoring-plugin to be feature driven, allowing for each feature to be toggled on or off individually. This conversion will happen over the course of the following PRs:

  1. This PR, which fixes CMO to point to the correct config directory so that the *.patch.json feature files are able to be loaded correctly
  2. Change the monitoring-plugin backend to handle such that if no feature flags are passed then the current monitoring-plugin features are enabled (OU-1389: swap monitoring-plugin to be feature driven monitoring-plugin#1034)
  3. Change CMO to directly pass in the alerting, targets, metrics and legacy-dashboards feature flags to the monitoring-plugin. Ensure the TestClusterMonitorConsolePlugin test still passes
  4. Adjust the monitoring-plugin to serve no features is no feature flags are passed in

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jul 6, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

The container startup argument --config-path for the monitoring-plugin is updated from /opt/app-root/web/dist to /opt/app-root/config in both the jsonnet source file and its corresponding generated deployment YAML asset. No other arguments, settings, or public entity declarations are affected.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Changes

File Change Summary
jsonnet/components/monitoring-plugin.libsonnet Updated --config-path argument value
assets/monitoring-plugin/deployment.yaml Updated generated --config-path argument value

Related PRs: None identified.

Suggested labels: monitoring-plugin, config-change

Suggested reviewers: None identified.

🐰 A tiny hop from dist to config,
One path renamed, no logic to unlock,
Jsonnet whispers, manifest replies,
Same little change beneath two skies.

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR only changes deployment/jsonnet config-path args; no Ginkgo test titles or test files were modified.
Test Structure And Quality ✅ Passed No Ginkgo test files changed; the PR only updates monitoring-plugin config paths in deployment/jsonnet manifests.
Microshift Test Compatibility ✅ Passed No Ginkgo e2e tests were added or modified; the PR only changes monitoring-plugin config paths in YAML/Jsonnet.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo/e2e tests were added; the PR only changes monitoring-plugin config-path args in YAML/jsonnet, so SNO compatibility is unaffected.
Topology-Aware Scheduling Compatibility ✅ Passed Only --config-path changed; existing replicas=2, maxUnavailable=1, anti-affinity, and nodeSelector were unchanged, so no new topology risk.
Ote Binary Stdout Contract ✅ Passed PR only changes monitoring-plugin config paths in deployment/jsonnet; no process-level stdout writes or startup code were added or modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Diff only changes deployment/jsonnet args; no new Ginkgo e2e tests or networked test code were added, so the IPv6/disconnected check is not triggered.
No-Weak-Crypto ✅ Passed The PR only changes the monitoring-plugin config path; scans found no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or non-constant-time secret compares.
Container-Privileges ✅ Passed Only config-path changed; monitoring-plugin manifests still use allowPrivilegeEscalation: false and runAsNonRoot: true, with no privileged/host* settings.
No-Sensitive-Data-In-Logs ✅ Passed The only changes are --config-path updates; no logging statements or sensitive data exposure were added in the touched files.
Title check ✅ Passed The title clearly states the config-path fix for the monitoring-plugin and matches the main change.
Description check ✅ Passed The description explains the purpose and rollout plan, and the telemetry template is not applicable to these file changes.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@PeterYurkovich

Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci

openshift-ci Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

@PeterYurkovich: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@PeterYurkovich PeterYurkovich changed the title OU-1137: config path to point to correct directory OU-1377: config path to point to correct directory Jul 8, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

@PeterYurkovich: This pull request references OU-1377 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

This PR is part of a set that looks to update the monitoring-plugin to be feature driven, allowing for each feature to be toggled on or off individually. This conversion will happen over the course of the following PRs:

  1. This PR, which fixes CMO to point to the correct config directory so that the *.patch.json feature files are able to be loaded correctly
  2. Change the monitoring-plugin backend to be feature driven and handle no feature flags so that the current monitoring-plugin features are enabled (OU-1389: swap monitoring-plugin to be feature driven monitoring-plugin#1034) for backwards compatability
  3. Change CMO to directly pass in the alerting, targets, metrics and legacy-dashboards feature flags to the monitoring-plugin. Ensure the TestClusterMonitorConsolePlugin test still passes
  4. Adjust the monitoring-plugin to serve no features is no feature flags are passed in

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 openshift-eng/jira-lifecycle-plugin repository.

@machine424

Copy link
Copy Markdown
Contributor

/testwith openshift/cluster-monitoring-operator/main/e2e-agnostic-operator openshift/monitoring-plugin#1034

@PeterYurkovich PeterYurkovich changed the title OU-1377: config path to point to correct directory OU-1389: config path to point to correct directory Jul 8, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

@PeterYurkovich: This pull request references OU-1389 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

This PR is part of a set that looks to update the monitoring-plugin to be feature driven, allowing for each feature to be toggled on or off individually. This conversion will happen over the course of the following PRs:

  1. This PR, which fixes CMO to pass the correct config directory to the monitoring-plugin so that the *.patch.json feature files are able to be loaded correctly
  2. Change the monitoring-plugin backend to be feature driven and handle no feature flags so that the current monitoring-plugin features are enabled (OU-1389: swap monitoring-plugin to be feature driven monitoring-plugin#1034) for backwards compatability
  3. Change CMO to directly pass in the alerting, targets, metrics and legacy-dashboards feature flags to the monitoring-plugin. Ensure the TestClusterMonitorConsolePlugin test still passes
  4. Adjust the monitoring-plugin to serve no features is no feature flags are passed in

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 openshift-eng/jira-lifecycle-plugin repository.

@machine424

Copy link
Copy Markdown
Contributor

/lgtm
/verified by existing e2e tests

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 8, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@machine424: This PR has been marked as verified by existing e2e tests.

Details

In response to this:

/lgtm
/verified by existing e2e tests

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 8, 2026
@openshift-ci

openshift-ci Bot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: machine424, PeterYurkovich

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 81d1a31 into openshift:main Jul 8, 2026
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants