Skip to content

[release-4.1] Bug 1746176: DR: backport fixes #834

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 6 commits into from
Jun 11, 2019
Merged

[release-4.1] Bug 1746176: DR: backport fixes #834

openshift-merge-robot merged 6 commits into from
Jun 11, 2019

Conversation

@hexfusion
Copy link
Contributor

@hexfusion hexfusion commented Jun 7, 2019 •
edited
Loading

This PR backports all fixes to DR between 5/20 - 6/5 as outlined below

Branch Date Message Commit Author
Master (#804) 6/5/19 DR: use param to populate etcd name for etcd-member-recover b8994e0 hexfusion
Master (#793) 5/24/19 DR: add validate_environment to openshift-recovery-tools 4e0e2d1 hexfusion
Master (#788) 5/22/19 Reload systemd services on disk before starting kubelet 9287919 vrutkovs
Master (#779) 5/20/19 Store stopped manifests in ASSET_DIR 8554f3a vrutkovs
Master (#779) 5/20/19 DR start_static_pods: reread a list of static pods when starting them dd3be74 vrutkovs
Master (#780) 5/20/19 templates/master/00-master: resolve unpopulated var when ETCD_CONNSTR… … 9fb4732 hexfusion

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1718436

hexfusion and others added 5 commits June 7, 2019 11:51
@hexfusion
templates/master/00-master: resolve unpopulated var when ETCD_CONNSTR…
4ebfeb4 
…ING is not passed

Signed-off-by: Sam Batschelet <[email protected]>
@hexfusion
DR start_static_pods: reread a list of static pods when starting them
8ca0727 
Script won't start all stopped pods if it was terminated and restarted.
Instead it should re-read a list of pods in MANIFEST_STOPPED_DIR and
move them to MANIFEST_DIR
@hexfusion
Store stopped manifests in ASSET_DIR
9f84d3c
@hexfusion
Reload systemd services on disk before starting kubelet
7e2caa8 
If the service has changed kubelet won't start without daemon reload
@hexfusion
DR: add validate_environment to openshift-recovery-tools
59114e2 
Signed-off-by: Sam Batschelet <[email protected]>
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 7, 2019
@hexfusion
Copy link
Contributor Author

hexfusion commented Jun 7, 2019

/cc @vrutkovs @brenton

@vrutkovs
Copy link
Contributor

vrutkovs commented Jun 7, 2019

/test e2e-restore-cluster-state

@brenton
Copy link

brenton commented Jun 7, 2019

Do we have bugzillas for any of these fixes? Now that we're GA we'll need bugs opened in order to make changes to the released product.

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jun 7, 2019

@brenton I think a BZ is forthcoming to get these fixes backported

@hexfusion
Copy link
Contributor Author

hexfusion commented Jun 7, 2019

/test e2e-restore-cluster-state

@hexfusion hexfusion changed the title [release-4.1] DR: backport fixes [release-4.1] Bug 1718436 DR: backport fixes Jun 7, 2019
@hexfusion
Copy link
Contributor Author

hexfusion commented Jun 7, 2019

BZ : https://bugzilla.redhat.com/show_bug.cgi?id=1718436

@kikisdeliveryservice kikisdeliveryservice changed the title [release-4.1] Bug 1718436 DR: backport fixes [release-4.1] Bug 1718436: DR: backport fixes Jun 7, 2019
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 7, 2019

@hexfusion: This pull request references an invalid Bugzilla bug:

  • expected the bug to target the "4.1.z" release, but it targets "---" instead
Details

In response to this:

[release-4.1] Bug 1718436: DR: backport fixes

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 bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jun 7, 2019
@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jun 7, 2019 •
edited
Loading

(added a colon in the name to get the bugzilla tags active. looks like the BZ doesn't have a target release which is needed in order to backport.)

@vrutkovs
Copy link
Contributor

vrutkovs commented Jun 10, 2019

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jun 10, 2019
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 10, 2019

@vrutkovs: This pull request references a valid Bugzilla bug.

Details

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-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jun 10, 2019
vrutkovs
vrutkovs approved these changes Jun 10, 2019
View reviewed changes
Copy link
Contributor

@vrutkovs vrutkovs 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2019
@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jun 10, 2019

/approve

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jun 10, 2019 •
edited
Loading

but @vrutkovs you'll have to send an email out to get this officially backported

I sent out the email and CC'ed you. 😄

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 10, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, kikisdeliveryservice, vrutkovs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [kikisdeliveryservice]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 10, 2019
@nstielau nstielau added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 10, 2019
@openshift-merge-robot openshift-merge-robot merged commit c2c5691 into openshift:release-4.1 Jun 11, 2019
@hexfusion hexfusion changed the title [release-4.1] Bug 1718436: DR: backport fixes [release-4.1] Bug 1746176: DR: backport fixes Aug 27, 2019
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Aug 27, 2019

@hexfusion: All pull requests linked via external trackers have merged. Bugzilla bug 1746176 has been moved to the MODIFIED state.

Details

In response to this:

[release-4.1] Bug 1746176: DR: backport fixes

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.

@hexfusion
Copy link
Contributor Author

hexfusion commented Aug 27, 2019

Updated the bug in title to properly reflect the 4.1.z issue https://bugzilla.redhat.com/show_bug.cgi?id=1746176

@hexfusion hexfusion deleted the bp-dr-4.1 branch August 27, 2019 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ashcrow ashcrow Awaiting requested review from ashcrow

@cgwalters cgwalters Awaiting requested review from cgwalters

@brenton brenton Awaiting requested review from brenton

1 more reviewer

@vrutkovs vrutkovs vrutkovs approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@vrutkovs vrutkovs

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@hexfusion @vrutkovs @brenton @kikisdeliveryservice @openshift-ci-robot @nstielau @openshift-merge-robot