Skip to content

Conversation

@ewolinetz
Copy link
Contributor

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 11, 2019
@ewolinetz
Copy link
Contributor Author

wip to test pvc message scenario

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 11, 2019
@ewolinetz ewolinetz force-pushed the stuck_missing_deployments branch from d9cb79f to 30e662b Compare September 11, 2019 21:37
@ewolinetz ewolinetz force-pushed the stuck_missing_deployments branch from 30e662b to 9e0083e Compare September 11, 2019 21:46
@ewolinetz ewolinetz changed the title [WIP] Bug 1743194 - For nodes that have been deleted during upgrade, recreate them Bug 1743194 - For nodes that have been deleted during upgrade, recreate them Sep 11, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 11, 2019
@ewolinetz ewolinetz requested a review from jcantrill September 11, 2019 21:48
Copy link
Contributor

@jcantrill jcantrill 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 Sep 12, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ewolinetz, jcantrill

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:
  • OWNERS [ewolinetz,jcantrill]

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 3aeb063 into openshift:master Sep 12, 2019
@jcantrill jcantrill changed the title Bug 1743194 - For nodes that have been deleted during upgrade, recreate them Bug 1743194: For nodes that have been deleted during upgrade, recreate them Sep 12, 2019
@openshift-ci-robot
Copy link

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

In response to this:

Bug 1743194: For nodes that have been deleted during upgrade, recreate them

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.

@ewolinetz
Copy link
Contributor Author

/cherrypick release-4.1

@openshift-cherrypick-robot

@ewolinetz: #186 failed to apply on top of branch "release-4.1":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/k8shandler/deployment.go
M	pkg/k8shandler/nodetypefactory.go
M	pkg/k8shandler/persistentvolumeclaims.go
M	pkg/k8shandler/statefulset.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/k8shandler/statefulset.go
Auto-merging pkg/k8shandler/persistentvolumeclaims.go
CONFLICT (content): Merge conflict in pkg/k8shandler/persistentvolumeclaims.go
Auto-merging pkg/k8shandler/nodetypefactory.go
Auto-merging pkg/k8shandler/deployment.go
Patch failed at 0001 for nodes that have been deleted during upgrade, recreate them

In response to this:

/cherrypick release-4.1

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. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants