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.

Sign up for GitHub

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

Jump to bottom

[release-4.10] Bug 2099686: controller: de-couple FIPS and realtime detection #3201

Merged
merged 1 commit into from Jul 19, 2022
Merged

[release-4.10] Bug 2099686: controller: de-couple FIPS and realtime detection #3201

merged 1 commit into from Jul 19, 2022

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #3200

/assign yuqi-zhang

@yuqi-zhang
controller: de-couple FIPS and realtime detection
aefcb4e 
Our current logic looks for FIPS and kerneltype in the same loop,
breaking if any of them sets type=realtime. This means that if both
are enabled, and the FIPS MachineConfig is higher alphanumerically
compared to kerneltype (which is generally the case: installer
generates FIPS as 99 and NTO generates realtime as 50), the FIPS gets
lost when merging, causing the cluster to break.

Modify the logic a bit so this can't happen. Also re-order the test
to ensure this case is fixed.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 21, 2022
Merged
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 21, 2022

@openshift-cherrypick-robot: Bugzilla bug 2096496 has been cloned as Bugzilla bug 2099686. Retitling PR to link against new bug.
/retitle [release-4.10] Bug 2099686: controller: de-couple FIPS and realtime detection

In response to this:

[release-4.10] Bug 2096496: controller: de-couple FIPS and realtime detection

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.

@openshift-ci openshift-ci bot changed the title [release-4.10] Bug 2096496: controller: de-couple FIPS and realtime detection [release-4.10] Bug 2099686: controller: de-couple FIPS and realtime detection Jun 21, 2022
@openshift-ci openshift-ci bot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 21, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 21, 2022

@openshift-cherrypick-robot: This pull request references Bugzilla bug 2099686, which is invalid:

  • expected dependent Bugzilla bug 2096496 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

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

In response to this:

[release-4.10] Bug 2099686: controller: de-couple FIPS and realtime detection

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.

@rioliu-rh
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 Jun 21, 2022
yuqi-zhang
yuqi-zhang approved these changes Jun 21, 2022
View reviewed changes
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.

There should be no risk to existing behaviour
/label backport-risk-assessed

@openshift-ci openshift-ci bot added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 21, 2022
@yuqi-zhang
Copy link
Contributor

Tested on 4.11. This should be enough to trigger a reproducer:

oc create -f- <<'EOF'
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
  labels:
    machineconfiguration.openshift.io/role: master
  name: 50-realtime-kernel
spec:
  config:
    ignition:
      version: 3.2.0
  kernelType: "realtime"
EOF

@yuqi-zhang
Copy link
Contributor

/bugzilla refresh

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 23, 2022

@yuqi-zhang: An error was encountered querying GitHub for users with public email (rioliu@redhat.com) for bug 2099686 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message. non-200 OK status code: 403 Forbidden body: "{\n \"documentation_url\": \"https://docs.github.com/en/free-pro-team@latest/rest/overview/resources-in-the-rest-api#secondary-rate-limits\",\n \"message\": \"You have exceeded a secondary rate limit. Please wait a few minutes before you try again.\"\n}\n"

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

In response to this:

/bugzilla 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 kubernetes/test-infra repository.

@yuqi-zhang
Copy link
Contributor

Apparently a throttling issue

/bugzilla refresh

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 23, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 23, 2022

@yuqi-zhang: This pull request references Bugzilla bug 2099686, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.z) matches configured target release for branch (4.10.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2096496 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2096496 targets the "4.11.0" release, which is one of the valid target releases: 4.11.0
  • bug has dependents

Requesting review from QA contact:
/cc @rioliu-rh

In response to this:

Apparently a throttling issue

/bugzilla 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 kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested a review from rioliu-rh June 23, 2022 13:27
@sinnykumari
Copy link
Contributor

/lgtm
/skip

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

openshift-ci bot commented Jun 24, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, sinnykumari, 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:
  • OWNERS [sinnykumari,yuqi-zhang]

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

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 2 against base HEAD c3ac7f0 and 8 for PR HEAD aefcb4e in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 1 against base HEAD c3ac7f0 and 7 for PR HEAD aefcb4e in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD c3ac7f0 and 6 for PR HEAD aefcb4e in total

@sinnykumari
Copy link
Contributor

/retest

@yuqi-zhang
Copy link
Contributor

/test e2e-agnostic-upgrade

1 similar comment
@sinnykumari
Copy link
Contributor

/test e2e-agnostic-upgrade

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 2 against base HEAD 616de1d and 5 for PR HEAD aefcb4e in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 18, 2022 •
edited

@openshift-cherrypick-robot: 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-aws-disruptive aefcb4e link false /test e2e-aws-disruptive
ci/prow/e2e-metal-ipi aefcb4e link false /test e2e-metal-ipi
ci/prow/e2e-aws-upgrade-single-node aefcb4e link false /test e2e-aws-upgrade-single-node
ci/prow/okd-e2e-gcp-op aefcb4e link false /test okd-e2e-gcp-op
ci/prow/e2e-gcp-op-single-node aefcb4e link false /test e2e-gcp-op-single-node
ci/prow/e2e-vsphere-upgrade aefcb4e link false /test e2e-vsphere-upgrade

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.

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 1 against base HEAD 616de1d and 4 for PR HEAD aefcb4e in total

@openshift-ci openshift-ci bot merged commit 3b880db into openshift:release-4.10 Jul 19, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 19, 2022

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 2099686 has been moved to the MODIFIED state.

In response to this:

[release-4.10] Bug 2099686: controller: de-couple FIPS and realtime detection

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
Reviewers

@yuqi-zhang yuqi-zhang yuqi-zhang approved these changes

@cheesesashimi cheesesashimi Awaiting requested review from cheesesashimi

@kikisdeliveryservice kikisdeliveryservice Awaiting requested review from kikisdeliveryservice

@rioliu-rh rioliu-rh Awaiting requested review from rioliu-rh

Assignees

@sinnykumari sinnykumari

@yuqi-zhang yuqi-zhang

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. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@openshift-cherrypick-robot @rioliu-rh @yuqi-zhang @sinnykumari @openshift-ci-robot