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 2077501: Merge Upstream etcd 3.5.3 into Openshift 4.9 #119

Merged
merged 86 commits into from May 9, 2022

Conversation

dusk125
Copy link

@dusk125 dusk125 commented Apr 20, 2022

Basis for 3.5.3 merge into openshift-4.9.

This PR was generated by:

  1. Merge upstream-3.5.3 into openshift-4.9, taking 'theirs' (upstream) on conflict.
  2. Took picklist and cherry-picked each commit hash onto a branch based on the upstream-3.5.3 tag.
  3. Create PR, from step 1, against remote/openshift-4.9
  4. Diff'ed branches from steps 1 and 2 to get picks that were clobbered by the merge (step 1).
  5. Re-picked the commit hashes from step 4; updated PR.

gyuho and others added 30 commits July 3, 2021 13:01
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
…of-#13145-etcd-io#13237-origin-release-3.5

[backport 3.5]: Automated cherry pick of etcd-io#13145 etcd-io#13237
Stop using tip golang version in CI
Fix for v3.5 Ensure that cluster members stored in v2store and backend are in sync
prefixArgs uses os.Setenv in e2e tests instead envMap.
This creates overwrites in some test cases and have an impact
on test quality and isolation between tests.
This PR uses ctlcontext envMap in each tests with high priority
and merges os environment variables with low priority.
Cherry pick "Fix http2 authority header in single endpoint scenario" to release-3.5
fixes: CVE-2021-3711, CVE-2021-35942, CVE-2019-9893

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
[release-3.5] Dockerfile: bump debian bullseye-20210927
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
storage/backend: Add a gauge to indicate if defrag is active (backport)
cherry-pick to 3.5 from etcd-io#13467 exclude the same alarm type activated by multiple peers
…ying

To fix a bug in the retry logic caused when the auth token is cleared after receiving `ErrInvalidAuthToken` from the server and the subsequent call to `getToken` also fails due to some reason (eg. context deadline exceeded).
This leaves the client without a token and the retry will continue to fail with `ErrUserEmpty` unless the token is refreshed.
@openshift-ci openshift-ci bot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Apr 21, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 21, 2022

@dusk125: This pull request references Bugzilla bug 2077501, which is invalid:

  • expected Bugzilla bug 2077501 to depend on a bug targeting a release in 4.10.0, 4.10.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.

In response to this:

Bug 2077501: Merge Upstream etcd 3.5.3 into Openshift 4.9

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 added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Apr 21, 2022
@dusk125
Copy link
Author

dusk125 commented Apr 21, 2022

/bugzilla refresh

@openshift-ci
Copy link

openshift-ci bot commented Apr 21, 2022

@dusk125: This pull request references Bugzilla bug 2077501, which is invalid:

  • expected Bugzilla bug 2077501 to depend on a bug targeting a release in 4.10.0, 4.10.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.

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.

@dusk125
Copy link
Author

dusk125 commented Apr 21, 2022

/bugzilla refresh

@openshift-ci
Copy link

openshift-ci bot commented Apr 21, 2022

@dusk125: This pull request references Bugzilla bug 2077501, which is invalid:

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

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

@Elbehery
Copy link

/retest

@openshift-ci
Copy link

openshift-ci bot commented Apr 26, 2022

@dusk125: 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.

@hasbro17
Copy link

/payload 4.11 ci blocking
/payload 4.11 nightly blocking

@openshift-ci
Copy link

openshift-ci bot commented Apr 26, 2022

@hasbro17: trigger 5 jobs of type blocking for the ci release of OCP 4.11

  • periodic-ci-openshift-release-master-ci-4.11-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.11-upgrade-from-stable-4.10-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.11-upgrade-from-stable-4.10-e2e-azure-upgrade
  • periodic-ci-openshift-release-master-ci-4.11-e2e-gcp-upgrade
  • periodic-ci-openshift-release-master-ci-4.11-e2e-aws-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/9751bde0-c58d-11ec-9840-31099bf27da2-0

trigger 7 jobs of type blocking for the nightly release of OCP 4.11

  • periodic-ci-openshift-release-master-nightly-4.11-e2e-aws-upgrade
  • periodic-ci-openshift-release-master-ci-4.11-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.11-upgrade-from-stable-4.10-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.11-e2e-aws-serial
  • periodic-ci-openshift-release-master-nightly-4.11-e2e-metal-ipi
  • periodic-ci-openshift-release-master-nightly-4.11-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.11-e2e-metal-ipi-serial-ipv4

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/9751bde0-c58d-11ec-9840-31099bf27da2-1

@Elbehery
Copy link

@hasbro17 this passed the test now

cc @dusk125

@dusk125
Copy link
Author

dusk125 commented Apr 29, 2022

/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 Apr 29, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 29, 2022

@dusk125: This pull request references Bugzilla bug 2077501, 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 release (4.9.z) matches configured target release for branch (4.9.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2077498 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2077498 targets the "4.10.z" release, which is one of the valid target releases: 4.10.0, 4.10.z
  • bug has dependents

Requesting review from QA contact:
/cc @geliu2016

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.

@openshift-ci openshift-ci bot requested a review from geliu2016 April 29, 2022 13:22
Copy link

@geliu2016 geliu2016 left a comment

Choose a reason for hiding this comment

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

/lgtm
/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 May 6, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 6, 2022
@hasbro17
Copy link

hasbro17 commented May 6, 2022

/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 May 6, 2022
@sdodson sdodson added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 9, 2022
@openshift-ci
Copy link

openshift-ci bot commented May 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: dusk125, geliu2016, hasbro17

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-merge-robot openshift-merge-robot merged commit d170c0d into openshift:openshift-4.9 May 9, 2022
@openshift-ci
Copy link

openshift-ci bot commented May 9, 2022

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

Bugzilla bug 2077501 has been moved to the MODIFIED state.

In response to this:

Bug 2077501: Merge Upstream etcd 3.5.3 into Openshift 4.9

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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet