Skip to content
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

OCPBUGS-32922: [release-4.15] add cluster fleet evaluation support to mco #4334

Conversation

rphillips
Copy link
Contributor

Backports #4316 to 4.15.

@openshift-ci openshift-ci bot requested review from cdoern and cgwalters April 24, 2024 16:08
@rphillips rphillips changed the title [release-4.15] add cluster fleet evaluation support to mco OCPBUGS-32922: [release-4.15] add cluster fleet evaluation support to mco Apr 24, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 24, 2024
@openshift-ci-robot
Copy link
Contributor

@rphillips: This pull request references Jira Issue OCPBUGS-32922, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
  • expected dependent Jira Issue OCPBUGS-32138 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Backports #4316 to 4.15.

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.

@rphillips rphillips force-pushed the add_fleet_evaluation_support_4.15 branch from dc09f71 to 10abc24 Compare April 24, 2024 18:36
@rphillips rphillips force-pushed the add_fleet_evaluation_support_4.15 branch from 10abc24 to 8fe1f69 Compare April 24, 2024 19:52
@rphillips
Copy link
Contributor Author

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 24, 2024
Copy link
Contributor

openshift-ci bot commented Apr 24, 2024

@rphillips: 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/okd-scos-e2e-aws-ovn 8fe1f69 link false /test okd-scos-e2e-aws-ovn
ci/prow/okd-scos-e2e-vsphere-ovn 8fe1f69 link false /test okd-scos-e2e-vsphere-ovn
ci/prow/okd-scos-e2e-gcp-ovn-upgrade 8fe1f69 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/e2e-gcp-op-layering 8fe1f69 link false /test e2e-gcp-op-layering
ci/prow/okd-scos-e2e-gcp-op 8fe1f69 link false /test okd-scos-e2e-gcp-op

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.

@rphillips
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Apr 29, 2024
@openshift-ci-robot
Copy link
Contributor

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-32138 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-32138 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (schoudha@redhat.com), skipping review request.

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-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 29, 2024
Copy link
Member

@QiWang19 QiWang19 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2024
@rphillips
Copy link
Contributor Author

/unassign @ptalgulk01 @mhanss
/assign @sinnykumari @yuqi-zhang for approvals

Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

Sane backport

Copy link
Contributor

openshift-ci bot commented Apr 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: QiWang19, rphillips, yuqi-zhang

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 29, 2024
@lyman9966
Copy link

lyman9966 commented Apr 30, 2024

/label qe-approved
1)oc get clusteroperators.config.openshift.io machine-config -o yaml | grep EvaluationConditionsDetected -B 3

  • lastTransitionTime: "2024-04-12T13:03:04Z"
    reason: AsExpected
    status: "False"
    type: EvaluationConditionsDetected
    2)Applying:
    apiVersion: machineconfiguration.openshift.io/v1
    kind: KubeletConfig
    metadata:
    name: set-worker-kube-config
    spec:
    machineConfigPoolSelector:
    matchLabels:
    pools.operator.machineconfiguration.openshift.io/worker: ""
    kubeletConfig:
    failSwapOn: false
    3)oc get clusteroperators.config.openshift.io machine-config -o yaml | grep EvaluationConditionsDetected -B 3
  • lastTransitionTime: "2024-04-30T05:01:00Z"
    reason: 'failswapon: KubeletConfig setting is currently unsupported by OpenShift'
    status: "True"
    type: EvaluationConditionsDetected
    4)Applying:
    apiVersion: machineconfiguration.openshift.io/v1
    kind: ContainerRuntimeConfig
    metadata:
    name: set-runtime
    spec:
    machineConfigPoolSelector:
    matchLabels:
    pools.operator.machineconfiguration.openshift.io/worker: ""
    containerRuntimeConfig:
    defaultRuntime: "runc"
    5)oc get clusteroperators.config.openshift.io machine-config -o yaml | grep EvaluationConditionsDetected -B 3
    reason: 'failswapon: KubeletConfig setting is currently unsupported by OpenShift::runc:
    transition to default crun'
    status: "True"
    type: EvaluationConditionsDetected
    6)Applying:
    apiVersion: config.openshift.io/v1
    kind: Node
    metadata:
    name: cluster
    spec:
    cgroupMode: v1
    7)oc get clusteroperators.config.openshift.io machine-config -o yaml | grep EvaluationConditionsDetected -B 5
  • lastTransitionTime: "2024-04-30T05:01:00Z"
    reason: 'cgroupsv1: support has been deprecated in favor of cgroupsv2::failswapon:
    KubeletConfig setting is currently unsupported by OpenShift::runc: transition
    to default crun'
    status: "True"
    type: EvaluationConditionsDetected

@sunilcio
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 30, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 1b35c4e into openshift:release-4.15 Apr 30, 2024
14 of 19 checks passed
@openshift-ci-robot
Copy link
Contributor

@rphillips: Jira Issue OCPBUGS-32922: All pull requests linked via external trackers have merged:

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

In response to this:

Backports #4316 to 4.15.

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

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.15.0-202404301242.p0.g1b35c4e.assembly.stream.el8 for distgit ose-machine-config-operator.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2024-04-30-234425

@rphillips
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@rphillips: #4334 failed to apply on top of branch "release-4.14":

Applying: add cluster fleet evaluation support to mco
Using index info to reconstruct a base tree...
M	cmd/machine-config-operator/start.go
M	pkg/controller/kubelet-config/helpers.go
M	pkg/controller/kubelet-config/kubelet_config_controller.go
M	pkg/controller/kubelet-config/kubelet_config_controller_test.go
M	pkg/controller/kubelet-config/kubelet_config_features_test.go
M	pkg/controller/kubelet-config/kubelet_config_nodes_test.go
M	pkg/operator/operator.go
M	pkg/operator/status.go
M	pkg/operator/sync.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/sync.go
Auto-merging pkg/operator/status.go
CONFLICT (content): Merge conflict in pkg/operator/status.go
Auto-merging pkg/operator/operator.go
CONFLICT (content): Merge conflict in pkg/operator/operator.go
Auto-merging pkg/controller/kubelet-config/kubelet_config_nodes_test.go
Auto-merging pkg/controller/kubelet-config/kubelet_config_features_test.go
CONFLICT (content): Merge conflict in pkg/controller/kubelet-config/kubelet_config_features_test.go
Auto-merging pkg/controller/kubelet-config/kubelet_config_controller_test.go
Auto-merging pkg/controller/kubelet-config/kubelet_config_controller.go
Auto-merging pkg/controller/kubelet-config/helpers.go
Auto-merging cmd/machine-config-operator/start.go
CONFLICT (content): Merge conflict in cmd/machine-config-operator/start.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add cluster fleet evaluation support to mco
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:

/cherry-pick release-4.14

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.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet