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-11850: Rebase etcd-3.5.9 into openshift-4.14 #203

Merged

Conversation

tjungblu
Copy link

@tjungblu tjungblu commented Jul 5, 2023

This is rebasing to the next higher release, plus adding the cherry-picks for the restore work that Allen has done upstream:

And a carry adding the etcdutl to our image: 0970055

sharathsivakumar and others added 12 commits April 25, 2023 08:02
…te flag

Signed-off-by: sharathsivakumar <mailssr9@gmail.com>
server: backport 15743, improved description of --initial-cluster-sta…
Signed-off-by: James Blair <mail@jamesblair.net>
Signed-off-by: James Blair <mail@jamesblair.net>
[3.5] Backport updating go to latest patch release 1.19.9
Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com>
Co-authored-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com>
Co-authored-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
[release-3.5] Move go version to dedicated .go-version file
@openshift-ci openshift-ci bot requested review from deads2k and hasbro17 July 5, 2023 12:34
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 5, 2023
tjungblu and others added 4 commits July 5, 2023 14:47
Signed-off-by: Allen Ray <alray@redhat.com>
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
…flags in snapshot restore command

Signed-off-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
@tjungblu
Copy link
Author

tjungblu commented Jul 5, 2023

/retest

@hasbro17
Copy link

hasbro17 commented Jul 5, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 5, 2023
@hasbro17
Copy link

hasbro17 commented Jul 5, 2023

Not really a backport but:

/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 Jul 5, 2023
@tjungblu
Copy link
Author

tjungblu commented Jul 6, 2023

/retest

@tjungblu
Copy link
Author

tjungblu commented Jul 6, 2023

@geliu2016 can you also add your CPA here please? I'm going to reuse the existing tickets, so you don't have to test twice.

@tjungblu
Copy link
Author

tjungblu commented Jul 6, 2023

/retitle OCPBUGS-11850: Rebase etcd-3.5.9 into openshift-4.14

@openshift-ci openshift-ci bot changed the title Rebase etcd-3.5.9 into openshift-4.14 OCPBUGS-11850: Rebase etcd-3.5.9 into openshift-4.14 Jul 6, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 6, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 6, 2023
@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-11850, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-15784 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-15784 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @geliu2016

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is rebasing to the next higher release, plus adding the cherry-picks for the restore work that Allen has done upstream:

And a carry adding the etcdutl to our image: 0970055

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 July 6, 2023 08:47
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.

/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 Jul 6, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jul 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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 5a36b9b into openshift:openshift-4.14 Jul 6, 2023
7 of 8 checks passed
@openshift-ci-robot
Copy link

@tjungblu: Jira Issue OCPBUGS-11850: All pull requests linked via external trackers have merged:

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

In response to this:

This is rebasing to the next higher release, plus adding the cherry-picks for the restore work that Allen has done upstream:

And a carry adding the etcdutl to our image: 0970055

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.

@tjungblu tjungblu deleted the rebase_4.14_3.5.9 branch July 6, 2023 08:53
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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

10 participants