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-2046: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 #244

Merged

Conversation

elmiko
Copy link

@elmiko elmiko commented Oct 5, 2022

this patch is being carried on the openshift release-4.11 so that we can ensure upgrades from 4.11 to 4.12 will work without issue.

…a1 to v1 in time for 1.25

this patch is being carried on the openshift release-4.11 so that we can
ensure upgrades from 4.11 to 4.12 will work without issue.
@openshift-ci
Copy link

openshift-ci bot commented Oct 5, 2022

@elmiko: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25

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 review from enxebre and frobware October 5, 2022 19:00
@elmiko elmiko changed the title switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 OCPBUGS-1484: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 Oct 5, 2022
@openshift-ci
Copy link

openshift-ci bot commented Oct 5, 2022

@elmiko: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

OCPBUGS-1484: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25

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-robot openshift-ci-robot added the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Oct 5, 2022
@openshift-ci-robot
Copy link

@elmiko: This pull request references Jira Issue OCPBUGS-1484, which is invalid:

  • expected the bug to target the "4.11.z" version, but it targets "4.12.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
  • expected Jira Issue OCPBUGS-1484 to depend on a bug targeting a version in 4.12.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

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 patch is being carried on the openshift release-4.11 so that we can ensure upgrades from 4.11 to 4.12 will work without issue.

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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 5, 2022
@sdodson
Copy link
Member

sdodson commented Oct 5, 2022

/retitle OCPBUGS-2046: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25

@openshift-ci openshift-ci bot changed the title OCPBUGS-1484: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 OCPBUGS-2046: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 Oct 5, 2022
@openshift-ci
Copy link

openshift-ci bot commented Oct 5, 2022

@elmiko: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

OCPBUGS-2046: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25

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

@elmiko: This pull request references Jira Issue OCPBUGS-2046, which is invalid:

  • expected Jira Issue OCPBUGS-2046 to depend on a bug targeting a version in 4.12.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

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 patch is being carried on the openshift release-4.11 so that we can ensure upgrades from 4.11 to 4.12 will work without issue.

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.

@sdodson
Copy link
Member

sdodson commented Oct 5, 2022

/jira refresh

@openshift-ci-robot
Copy link

@sdodson: This pull request references Jira Issue OCPBUGS-2046, which is invalid:

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

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

@openshift-ci
Copy link

openshift-ci bot commented Oct 5, 2022

@elmiko: 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/e2e-azure-operator ec7cc0c link false /test e2e-azure-operator

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.

@sdodson
Copy link
Member

sdodson commented Oct 6, 2022

/jira refresh

1 similar comment
@wking
Copy link
Member

wking commented Oct 6, 2022

/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. bugzilla/valid-bug Indicates that a referenced Bugzilla 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 Oct 6, 2022
@openshift-ci-robot
Copy link

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-1484 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-1484 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

Requesting review from QA contact:
/cc @sunzhaohua2

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

@openshift-ci openshift-ci bot requested a review from sunzhaohua2 October 6, 2022 04:34
@wking
Copy link
Member

wking commented Oct 6, 2022

e2e-aws-operator:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_kubernetes-autoscaler/244/pull-ci-openshift-kubernetes-autoscaler-release-4.11-e2e-aws-operator/1577735316385566720/artifacts/e2e-aws-operator/gather-audit-logs/artifacts/audit-logs.tar | tar xz --strip-components=2
$ zgrep -h system:serviceaccount:openshift-machine-api:cluster-autoscaler kube-apiserver/*.log.gz | jq -c '.objectRef | {apiGroup, apiVersion, resource}' | grep policy | sort | uniq -c
     32 {"apiGroup":"policy","apiVersion":"v1","resource":"poddisruptionbudgets"}

Which looks good to me 👍

@wking
Copy link
Member

wking commented Oct 6, 2022

...this patch is being carried on the openshift release-4.11 so that we can ensure upgrades from 4.11 to 4.12 will work without issue.

And just to refine this slightly. Without the 4.11.z backport, I expect updates from 4.11 to 4.12 would succeed. But there might be a window during the update when the outgoing autoscaler was trying to use the v1beta1 API vs. a Kube API server that no longer understood that version, and there might not be autoscaling until the incoming autoscaler showed up speaking the v1 API. My main interest in the 4.11.z backport is that if we have this code back in 4.11.z, it won't trip the APIRemovedInNext*ReleaseInUse alerts. So folks on those 4.11.z will be more confident that updates to 4.12 are safe, instead of guessing and then finding out how well they did in the middle of the update.

@JoelSpeed
Copy link

/approve
/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 Oct 6, 2022
@openshift-ci
Copy link

openshift-ci bot commented Oct 6, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 Oct 6, 2022
Copy link
Member

@wking wking 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 Oct 6, 2022
@sunzhaohua2
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 Oct 8, 2022
@openshift-merge-robot openshift-merge-robot merged commit 08ba0b6 into openshift:release-4.11 Oct 8, 2022
@openshift-ci-robot
Copy link

@elmiko: All pull requests linked via external trackers have merged:

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

In response to this:

this patch is being carried on the openshift release-4.11 so that we can ensure upgrades from 4.11 to 4.12 will work without issue.

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.

@sdodson
Copy link
Member

sdodson commented Oct 18, 2022

/cherry-pick release-4.10
Sounds like some folks are seeing the APIRemovedInNextEUS release in 4.10 and it'd be good if we were able to clear some of those up in those clusters which take later 4.10.z

@openshift-cherrypick-robot

@sdodson: #244 failed to apply on top of branch "release-4.10":

Applying: UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25
Using index info to reconstruct a base tree...
A	cluster-autoscaler/core/scaledown/actuation/drain.go
A	cluster-autoscaler/core/scaledown/actuation/drain_test.go
A	cluster-autoscaler/core/scaledown/legacy/legacy.go
A	cluster-autoscaler/core/scaledown/legacy/wrapper.go
A	cluster-autoscaler/core/scaledown/scaledown.go
M	cluster-autoscaler/core/static_autoscaler_test.go
M	cluster-autoscaler/simulator/cluster.go
M	cluster-autoscaler/simulator/cluster_test.go
Falling back to patching base and 3-way merge...
Auto-merging cluster-autoscaler/simulator/cluster_test.go
Auto-merging cluster-autoscaler/simulator/cluster.go
CONFLICT (content): Merge conflict in cluster-autoscaler/simulator/cluster.go
Auto-merging cluster-autoscaler/core/static_autoscaler_test.go
CONFLICT (modify/delete): cluster-autoscaler/core/scaledown/scaledown.go deleted in HEAD and modified in UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25. Version UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 of cluster-autoscaler/core/scaledown/scaledown.go left in tree.
CONFLICT (modify/delete): cluster-autoscaler/core/scaledown/legacy/wrapper.go deleted in HEAD and modified in UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25. Version UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 of cluster-autoscaler/core/scaledown/legacy/wrapper.go left in tree.
CONFLICT (modify/delete): cluster-autoscaler/core/scaledown/legacy/legacy.go deleted in HEAD and modified in UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25. Version UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 of cluster-autoscaler/core/scaledown/legacy/legacy.go left in tree.
CONFLICT (modify/delete): cluster-autoscaler/core/scaledown/actuation/drain_test.go deleted in HEAD and modified in UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25. Version UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 of cluster-autoscaler/core/scaledown/actuation/drain_test.go left in tree.
CONFLICT (modify/delete): cluster-autoscaler/core/scaledown/actuation/drain.go deleted in HEAD and modified in UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25. Version UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25 of cluster-autoscaler/core/scaledown/actuation/drain.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: <carry>: switched policy for PodDisruptionBudget from v1beta1 to v1 in time for 1.25
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.10
Sounds like some folks are seeing the APIRemovedInNextEUS release in 4.10 and it'd be good if we were able to clear some of those up in those clusters which take later 4.10.z

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.

@JoelSpeed
Copy link

@elmiko Could you please handle backporting this through to 4.10

@elmiko
Copy link
Author

elmiko commented Oct 18, 2022

i'll take a look

@elmiko elmiko deleted the backport-policy-4.11 branch October 20, 2022 04:08
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. 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. jira/severity-critical Referenced Jira bug's severity is critical 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants