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

Update machine-controller to v1.18.0 #1114

Merged
merged 1 commit into from
Sep 25, 2020
Merged

Update machine-controller to v1.18.0 #1114

merged 1 commit into from
Sep 25, 2020

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Sep 25, 2020

What this PR does / why we need it:

Update machine-controller to v1.18.0. This release includes a fix for the Docker installation issue on CentOS/RHEL.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Related to #1111

Does this PR introduce a user-facing change?:

Update machine-controller to v1.18.0

/assign @kron4eg

@xmudrii xmudrii requested a review from kron4eg September 25, 2020 14:10
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Sep 25, 2020
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xmudrii

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

@kubermatic-bot kubermatic-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 25, 2020
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 7af31d50d44b5a5e3857cbd5682b4caf1db2d21c

@kron4eg
Copy link
Member

kron4eg commented Sep 25, 2020

/cherrypick release/v1.0

@kubermatic-bot
Copy link
Contributor

@kron4eg: once the present PR merges, I will cherry-pick it on top of release/v1.0 in a new PR and assign it to you.

In response to this:

/cherrypick release/v1.0

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.

@kubermatic-bot kubermatic-bot merged commit df6d558 into master Sep 25, 2020
@kubermatic-bot kubermatic-bot added this to the v1.1 milestone Sep 25, 2020
@kubermatic-bot kubermatic-bot deleted the mc-1.18.0 branch September 25, 2020 14:40
@kubermatic-bot
Copy link
Contributor

@kron4eg: #1114 failed to apply on top of branch "release/v1.0":

Applying: Update machine-controller to v1.18.0
Using index info to reconstruct a base tree...
M	pkg/templates/machinecontroller/deployment.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/templates/machinecontroller/deployment.go
CONFLICT (content): Merge conflict in pkg/templates/machinecontroller/deployment.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update machine-controller to v1.18.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v1.0

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.

@xmudrii
Copy link
Member Author

xmudrii commented Sep 28, 2020

/cherrypick release/v1.0

@kubermatic-bot
Copy link
Contributor

@xmudrii: new pull request created: #1121

In response to this:

/cherrypick release/v1.0

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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants