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

Bug 2003027: Rebase 1.20.10 #935

Merged
merged 578 commits into from
Sep 17, 2021

Conversation

soltysh
Copy link

@soltysh soltysh commented Sep 7, 2021

rikatz and others added 30 commits May 6, 2021 12:12
… create ingress (kubernetes#101428)

* Fix validation in kubectl create ingress

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Fix validation in kubectl create ingress

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>
…pick-of-#100013-upstream-release-1.20

[1.20] Add duration encoder to structured logger
…-of-#100103-upstream-release-1.20

Automated cherry pick of kubernetes#100103: Updating EndpointSlice controllers to avoid duplicate
…pick-of-#99550-upstream-release-1.20

Automated cherry pick of kubernetes#99550: fix smb mount issue on Windows
…-pick-of-#101235-upstream-release-1.20

Automated cherry pick of kubernetes#101235: fix: azure file namespace issue in csi translation
…pick-of-#101005-upstream-release-1.20

Automated cherry pick of kubernetes#101005: Set namespace when using kubectl create service
…-pick-of-#101398-upstream-release-1.20

Automated cherry pick of kubernetes#101398: fix: set "host is down" as corrupted mount
…-pick-of-#100731-upstream-release-1.20

Automated cherry pick of kubernetes#100731: Normalize share name to not include capital letters
…y-pick-of-#100944-upstream-release-1.20

Automated cherry pick of kubernetes#100944: Ensure service deleted when the Azure resource group has been deleted
…k-of-#101752-upstream-release-1.20

Cherry pick of kubernetes#101752: fix: not tagging static public IP
…rry-pick-of-#99839-upstream-release-1.20

Automated cherry pick of kubernetes#99839: Cleanup portforward streams after their usage
[1.20][go1.15] Update to go1.15.12
@openshift-ci-robot
Copy link

@soltysh: the contents of this pull request could not be automatically validated.

The following commits are valid:

The following commits could not be validated and must be approved by a top-level approver:

@soltysh
Copy link
Author

soltysh commented Sep 8, 2021

/override ci/prow/verify-commits
that will never pass on a k8s update.

@soltysh soltysh 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. backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels Sep 8, 2021
@openshift-ci
Copy link

openshift-ci bot commented Sep 8, 2021

@soltysh: Overrode contexts on behalf of soltysh: ci/prow/verify-commits

In response to this:

/override ci/prow/verify-commits
that will never pass on a k8s update.

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.

@soltysh
Copy link
Author

soltysh commented Sep 8, 2021

Manually adding valid-bug label, based on discussion in control plane arch call.

@soltysh
Copy link
Author

soltysh commented Sep 10, 2021

/retest

@soltysh soltysh changed the title Bug 1994111: Rebase 1.20.10 Bug 2003027: Rebase 1.20.10 Sep 10, 2021
@openshift-ci
Copy link

openshift-ci bot commented Sep 10, 2021

@soltysh: This pull request references Bugzilla bug 2003027, which is invalid:

  • expected the bug to target the "4.7.z" release, but it targets "---" instead
  • expected Bugzilla bug 2003027 to depend on a bug targeting a release in 4.8.0, 4.8.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

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.

Retaining the bugzilla/valid-bug label as it was manually added.

In response to this:

Bug 2003027: Rebase 1.20.10

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.

@soltysh
Copy link
Author

soltysh commented Sep 13, 2021

/test e2e-aws-jenkins

1 similar comment
@soltysh
Copy link
Author

soltysh commented Sep 13, 2021

/test e2e-aws-jenkins

@tkashem
Copy link

tkashem commented Sep 13, 2021

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Sep 13, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: soltysh, tkashem

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 lgtm Indicates that a PR is ready to be merged. label Sep 13, 2021
@sdodson
Copy link
Member

sdodson commented Sep 15, 2021

/bugzilla refresh

@openshift-ci
Copy link

openshift-ci bot commented Sep 15, 2021

@sdodson: This pull request references Bugzilla bug 2003027, which is invalid:

  • expected dependent Bugzilla bug 1994457 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is NEW 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.

Retaining the bugzilla/valid-bug label as it was manually added.

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.

@soltysh
Copy link
Author

soltysh commented Sep 15, 2021

/bugzilla refresh

@sdodson the BZ will never be in the correct state, we've agreed during control plane arch call from Sep 7th, that for k8s updates we'll be manually setting that label

@sdodson
Copy link
Member

sdodson commented Sep 15, 2021

@soltysh why would the bug never become valid? We should at the very least make sure that we merge these bumps in descending order from 4.8 toward 4.6. I don't see why QE couldn't verify these bugs.

@hardys
Copy link

hardys commented Sep 16, 2021

@soltysh why would the bug never become valid? We should at the very least make sure that we merge these bumps in descending order from 4.8 toward 4.6. I don't see why QE couldn't verify these bugs.

@sdodson Ok I'm trying to understand how to proceed here - should we approve #888, remove the manual bugzilla/valid-bug then make this bz depend on https://bugzilla.redhat.com/show_bug.cgi?id=1994457 so we can land this when that 4.8 bump is verified?

@soltysh
Copy link
Author

soltysh commented Sep 16, 2021

Based on discussion I'm removing valid-label from this PR, until we merge #888.

@soltysh soltysh removed the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 16, 2021
@soltysh
Copy link
Author

soltysh commented Sep 17, 2021

Based on our discussion from yesterday and #888 merged, I'm adding valid-bug label to be able to merge this one in.

fyi @hardys

@soltysh soltysh added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 17, 2021
@hardys
Copy link

hardys commented Sep 17, 2021

[patch-manager] Approving for cherry-pick with a score of 1.00 - based on discussion yesterday we wanted to wait for #888 to land, but not necessarily block on verification of that since the fixes per-branch are not necessarily the same

@hardys hardys added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 17, 2021
@openshift-merge-robot openshift-merge-robot merged commit f58ea66 into openshift:release-4.7 Sep 17, 2021
@openshift-ci
Copy link

openshift-ci bot commented Sep 17, 2021

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

Bugzilla bug 2003027 has been moved to the MODIFIED state.

In response to this:

Bug 2003027: Rebase 1.20.10

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.

@soltysh soltysh deleted the rebase-1.20.10 branch September 17, 2021 10:22
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. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.