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

[release-4.12] OCPBUGS-23020: Introduce upgrading label to block concurrent upgrades #1932

Merged

Conversation

jrvaldes
Copy link
Contributor

@jrvaldes jrvaldes commented Nov 7, 2023

This is a manual cherry-pick of #1901

@jrvaldes
Copy link
Contributor Author

jrvaldes commented Nov 7, 2023

/jira cherrypick OCPBUGS-23016

@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 Nov 7, 2023
@openshift-ci-robot
Copy link

@jrvaldes: Jira Issue OCPBUGS-23016 has been cloned as Jira Issue OCPBUGS-23020. Will retitle bug to link to clone.
/retitle OCPBUGS-23020: Introduce upgrading label to block concurrent upgrades

In response to this:

/jira cherrypick OCPBUGS-23016

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.

Copy link
Contributor

openshift-ci bot commented Nov 7, 2023

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 changed the title Introduce upgrading label to block concurrent upgrades OCPBUGS-23020: Introduce upgrading label to block concurrent upgrades Nov 7, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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 Nov 7, 2023
@openshift-ci-robot
Copy link

@jrvaldes: This pull request references Jira Issue OCPBUGS-23020, which is invalid:

  • expected dependent Jira Issue OCPBUGS-23016 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New 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:

This is a manual cherry-pick of #1901

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.

@jrvaldes jrvaldes changed the title OCPBUGS-23020: Introduce upgrading label to block concurrent upgrades [release-4.12] OCPBUGS-23020: Introduce upgrading label to block concurrent upgrades Nov 7, 2023
@jrvaldes
Copy link
Contributor Author

jrvaldes commented Nov 7, 2023

/test ?

Copy link
Contributor

openshift-ci bot commented Nov 7, 2023

@jrvaldes: The following commands are available to trigger required jobs:

  • /test aws-e2e-operator
  • /test aws-e2e-upgrade
  • /test azure-e2e-operator
  • /test build
  • /test ci-bundle-wmco-bundle
  • /test gcp-e2e-operator
  • /test images
  • /test lint
  • /test platform-none-vsphere-e2e-operator
  • /test security
  • /test unit
  • /test vsphere-e2e-operator
  • /test wicd-unit-vsphere

Use /test all to run all jobs.

In response to this:

/test ?

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.

@mtnbikenc
Copy link
Member

mtnbikenc commented Dec 1, 2023

/hold
Until after 7.2.0

@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 Dec 1, 2023
@mtnbikenc
Copy link
Member

/hold cancel

@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 Dec 14, 2023
@jrvaldes jrvaldes force-pushed the release-4.12-backport-1901 branch 2 times, most recently from d2d4d25 to c2c8a14 Compare December 18, 2023 04:17
@jrvaldes jrvaldes marked this pull request as ready for review December 18, 2023 04:17
@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 18, 2023
@jrvaldes
Copy link
Contributor Author

/retest-required

1 similar comment
@jrvaldes
Copy link
Contributor Author

/retest-required

@jrvaldes
Copy link
Contributor Author

jrvaldes commented Jan 4, 2024

/jira refresh

@openshift-ci-robot
Copy link

@jrvaldes: This pull request references Jira Issue OCPBUGS-23020, which is invalid:

  • expected dependent Jira Issue OCPBUGS-23016 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:

/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.

@jrvaldes
Copy link
Contributor Author

jrvaldes commented Jan 4, 2024

/retest-required

@jrvaldes
Copy link
Contributor Author

jrvaldes commented Jan 4, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 4, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2024
@jrvaldes
Copy link
Contributor Author

/hold

need WINC-1191 for validation

@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 Jan 18, 2024
@jrvaldes
Copy link
Contributor Author

This change introduces the concept of maximum number of parallel upgrades
that takes place concurrently for Windows nodes during reconciliation.

The `windowsmachineconfig.openshift.io/upgrading` label is proposed
as the locking mechanism among the Windows nodes to account for how
many instances can perform an upgrade under following a threshold
i.e. MaxParallelUpgrades which is fixed to 1.

(cherry picked from commit f1dd8f5)
This commit introduces a test to check the maximum allowed numbers
of Windows nodes upgrading in parallel. The test is divided in two
phases, 1) setup and 2) test, where the setup phase deploys a job
with a fixed name that constantly fetch the number of Windows nodes
with the `windowsmachineconfig.openshift.io/upgrading` label
and fail if is greater than the maximum allowed. The polling
frequency is set to 5 seconds.

The latter test, checks the number of failed pods for the
checker job and require no failures, otherwise fails the e2e test.

A new service account is proposed in the test namespace to hold the
RBAC required by the checker job to list the nodes in the test cluster.

The test is designed to run as a separate job due to the structure of
the new upgrade test in vSphere (vsphere-e2e-upgrade) that is scattered
between the steps in the release repo and code in the WMCO test suite.

(cherry picked from commit e03c792)
This changes aggregates the RBAC resources required by the test runner job
in the proposed function ensureTestRunnerRBAC() to avoid duplication of
intended functionality.

(cherry picked from commit a2a6f6b)
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2024
@jrvaldes
Copy link
Contributor Author

/test azure-e2e-upgrade

@jrvaldes
Copy link
Contributor Author

/hold cancel

blocker pr merged.

@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 Feb 16, 2024
@jrvaldes
Copy link
Contributor Author

/test remaining-required

Copy link
Contributor

@saifshaikh48 saifshaikh48 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 Feb 19, 2024
This change enables the version annotation check while waiting for the
Windows nodes to be fully configured after triggering an upgrade.

Before, both nodes were getting configured at the same time so this
wasn't an issue, but now with the sequential order of the upgrade
process WMCO takes some time to start processing the next node and
the test was failing due to version annotation mismatch.

(cherry picked from commit 32ab771)
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2024
@sebsoto
Copy link
Contributor

sebsoto commented Feb 19, 2024

/approve

Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jrvaldes, sebsoto

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 Feb 19, 2024
@saifshaikh48
Copy link
Contributor

/lgtm

@jrvaldes
Copy link
Contributor Author

/test remaining-required

Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

@jrvaldes: all tests passed!

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.

@jrvaldes
Copy link
Contributor Author

/tide refresh

@alinaryan
Copy link
Contributor

/lgtm

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

/lgtm

@openshift-merge-bot openshift-merge-bot bot merged commit 21bf7cb into openshift:release-4.12 Feb 19, 2024
15 checks passed
@openshift-ci-robot
Copy link

@jrvaldes: Jira Issue OCPBUGS-23020: All pull requests linked via external trackers have merged:

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

In response to this:

This is a manual cherry-pick of #1901

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.

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/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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

7 participants