Skip to content

Conversation

@djoshy
Copy link
Contributor

@djoshy djoshy commented Dec 15, 2025

- What I did
This PR moves operator metrics into the controller deployment, so that the metrics server can be removed from the operator. See attached card for additional details. It also updates the metrics server in the daemon and controller to actually use the ciphers - our original implementation only set the ciphers for the kube-rbac-proxy container and not the MCC/MCD listeners.

- How to verify it
Metrics should continue to work as we expect.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 15, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 15, 2025
@djoshy djoshy changed the title operator: remove TLS hardcode in manifest MCO-2018: Move operator metrics into the controller Dec 15, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 15, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 15, 2025

@djoshy: This pull request references MCO-2018 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

- What I did

- How to verify it

- Description for the changelog

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-robot
Copy link
Contributor

openshift-ci-robot commented Dec 15, 2025

@djoshy: This pull request references MCO-2018 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

- What I did
This PR moves operator metrics into the controller deployment, so that the metrics server can be removed from the operator. See card for additional details.

- How to verify it
Metrics should continue to work as we expect.

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-robot
Copy link
Contributor

openshift-ci-robot commented Dec 15, 2025

@djoshy: This pull request references MCO-2018 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

- What I did
This PR moves operator metrics into the controller deployment, so that the metrics server can be removed from the operator. See card for additional details.

- How to verify it
Metrics should continue to work as we expect.

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-robot
Copy link
Contributor

openshift-ci-robot commented Dec 15, 2025

@djoshy: This pull request references MCO-2018 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

- What I did
This PR moves operator metrics into the controller deployment, so that the metrics server can be removed from the operator. See attached card for additional details.

- How to verify it
Metrics should continue to work as we expect.

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-robot
Copy link
Contributor

openshift-ci-robot commented Dec 16, 2025

@djoshy: This pull request references MCO-2018 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

- What I did
This PR moves operator metrics into the controller deployment, so that the metrics server can be removed from the operator. See attached card for additional details. It also updates the metrics server in the daemon and controller to actually use the ciphers - our original implementation only set the ciphers for the kube-rbac-proxy container and not the MCC/MCD listeners.

- How to verify it
Metrics should continue to work as we expect.

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.

@djoshy djoshy marked this pull request as ready for review December 16, 2025 16:20
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 16, 2025
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 thought this test was a little strange, as we're just running the sync loop and reading the value back; its not really testing the metrics server, so I decided to remove it. We do have an e2e that we could beef up, but not sure it is necessary since much of the business logic isn't in the MCO.

Copy link
Member

Choose a reason for hiding this comment

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

I agree with your point that beefing up the e2e you linked is not necessary for the reason you shared.

@djoshy
Copy link
Contributor Author

djoshy commented Dec 16, 2025

/test okd-scos-images

Copy link
Member

@isabella-janssen isabella-janssen left a comment

Choose a reason for hiding this comment

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

/lgtm

Changes make sense to me.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 19, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen

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:
  • OWNERS [djoshy,isabella-janssen]

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

@kaleemsiddiqu
Copy link

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 19, 2025

@djoshy: 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/bootstrap-unit 4dc3dcd link false /test bootstrap-unit

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.

@djoshy
Copy link
Contributor Author

djoshy commented Dec 19, 2025

Running an unrelated test job to sanity check #5508 (comment)

/payload-job periodic-ci-openshift-multiarch-master-nightly-4.22-ocp-e2e-aws-ovn-multi-day-0-x-a

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 19, 2025

@djoshy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-multiarch-master-nightly-4.22-ocp-e2e-aws-ovn-multi-day-0-x-a

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d94715c0-dcf8-11f0-95b9-6ee719027701-0

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants