Skip to content

OCPBUGS-57458: add MachineConfiguration to CO related objects #5124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2025

Conversation

djoshy
Copy link
Contributor

@djoshy djoshy commented Jun 16, 2025

- What I did
Adds MachineConfiguration(where the MCO's global knobs live) to the CO's related objects.

- How to verify it

  • status.relatedObjects & must gathers should now include the MachineConfiguration object.

@openshift-ci-robot
Copy link
Contributor

@djoshy: An error was encountered updating to the POST state for bug OCPBUGS-57458 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message. No response returned: Post "https://issues.redhat.com/rest/api/2/issue/17062606/transitions": POST https://issues.redhat.com/rest/api/2/issue/17062606/transitions giving up after 5 attempt(s)

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

In response to this:

- What I did
Adds MachineConfiguration(where the MCO's global knobs live) to the CO's related objects.

- How to verify it

  • status.relatedObjects & must gathers should now include the MachineConfiguration object.

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

djoshy commented Jun 16, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 16, 2025
@openshift-ci-robot
Copy link
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-57458, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.20.0) matches configured target version for branch (4.20.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

/jira refresh

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2025
@@ -64,6 +64,7 @@ func (optr *Operator) syncRelatedObjects(co *configv1.ClusterOperator) {
{Group: "machineconfiguration.openshift.io", Resource: "kubeletconfigs"},
{Group: "machineconfiguration.openshift.io", Resource: "containerruntimeconfigs"},
{Group: "machineconfiguration.openshift.io", Resource: "machineconfigs"},
{Group: "operator.openshift.io", Resource: "machineconfigurations"},
Copy link
Member

Choose a reason for hiding this comment

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

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

openshift-ci bot commented Jun 16, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, wking

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:

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

@djoshy
Copy link
Contributor Author

djoshy commented Jun 16, 2025

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 16, 2025
@ptalgulk01
Copy link

Pre-merge verified:
Verified using IPI based AWS,GCP 4.20 cluster.
Checked the new object operator.openshift.io added in machineconfiguration

$ oc get co machine-config -o yaml
....
status:
...
  relatedObjects:
....
  - group: operator.openshift.io
    name: ""
    resource: machineconfigurations

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jun 17, 2025
@openshift-ci-robot
Copy link
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-57458, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.20.0) matches configured target version for branch (4.20.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

- What I did
Adds MachineConfiguration(where the MCO's global knobs live) to the CO's related objects.

- How to verify it

  • status.relatedObjects & must gathers should now include the MachineConfiguration object.

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

djoshy commented Jun 17, 2025

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2025
@sergiordlr
Copy link
Contributor

verified using IPI on AWS

$ oc get co machine-config -ojsonpath='{.status.relatedObjects}' | jq | grep '"machineconfigurations"' -A 4 -B4
  },
  {
    "group": "operator.openshift.io",
    "name": "",
    "resource": "machineconfigurations"
  },
  {
    "group": "",


$ omc get machineconfiguration
NAME      AGE
cluster   2h

As we can read in previous comments, the machineconfiguration resource is collected in the gather-extra section of the CI too.

/label qe-approved

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD b3377c9 and 2 for PR HEAD 3e5a13a in total

1 similar comment
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD b3377c9 and 2 for PR HEAD 3e5a13a in total

@umohnani8
Copy link
Contributor

LGTM

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD a12b62b and 1 for PR HEAD 3e5a13a in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD a12b62b and 2 for PR HEAD 3e5a13a in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD a4ec776 and 1 for PR HEAD 3e5a13a in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD a4ec776 and 2 for PR HEAD 3e5a13a in total

@djoshy
Copy link
Contributor Author

djoshy commented Jun 21, 2025

/retest-required

Copy link
Contributor

openshift-ci bot commented Jun 21, 2025

@djoshy: The following tests 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/e2e-gcp-op-ocl 3e5a13a link false /test e2e-gcp-op-ocl
ci/prow/okd-scos-e2e-aws-ovn 3e5a13a link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-azure-ovn-upgrade-out-of-change 3e5a13a link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/e2e-aws-ovn-upgrade-out-of-change 3e5a13a link false /test e2e-aws-ovn-upgrade-out-of-change
ci/prow/e2e-gcp-op-techpreview 3e5a13a link false /test e2e-gcp-op-techpreview

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

@djoshy
Copy link
Contributor Author

djoshy commented Jun 21, 2025

/override ci/prow/e2e-aws-ovn-upgrade

Overriding since this PR has passed the test before on the same commit and failure seems unrelated.

Copy link
Contributor

openshift-ci bot commented Jun 21, 2025

@djoshy: Overrode contexts on behalf of djoshy: ci/prow/e2e-aws-ovn-upgrade

In response to this:

/override ci/prow/e2e-aws-ovn-upgrade

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 7177bf1 into openshift:main Jun 21, 2025
14 of 19 checks passed
@openshift-ci-robot
Copy link
Contributor

@djoshy: Jira Issue OCPBUGS-57458: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-57458 has been moved to the MODIFIED state.

In response to this:

- What I did
Adds MachineConfiguration(where the MCO's global knobs live) to the CO's related objects.

- How to verify it

  • status.relatedObjects & must gathers should now include the MachineConfiguration object.

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

djoshy commented Jun 21, 2025

/cherry-pick release-4.19 release-4.18 release-4.17

@openshift-cherrypick-robot

@djoshy: new pull request created: #5132

In response to this:

/cherry-pick release-4.19 release-4.18 release-4.17

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.20.0-202506211442.p0.g7177bf1.assembly.stream.el9.
All builds following this will include this PR.

@djoshy djoshy deleted the add-knob-to-related branch June 24, 2025 13:53
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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants