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.

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

Update machine-controller to v1.5.4 #4178

Merged
merged 1 commit into from
Aug 26, 2019
Merged

Update machine-controller to v1.5.4 #4178

merged 1 commit into from
Aug 26, 2019

Conversation

alvaroaleman
Copy link
Contributor

What this PR does / why we need it:

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

Special notes for your reviewer:

Documentation:

Does this PR introduce a user-facing change?:

Fix worker nodes provisioning for instances with a Kernel >= 4.19

/assign @kdomanski
/cherrypick release/v2.11

@kubermatic-bot kubermatic-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Aug 26, 2019
@kubermatic-bot kubermatic-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 26, 2019
@kdomanski
Copy link
Contributor

/approve
/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 0fdd3fc64ab633f3ab604bcc6327ae98feec4c1e

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kdomanski

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 26, 2019
@kubermatic-bot kubermatic-bot merged commit 2329cf4 into master Aug 26, 2019
@kubermatic-bot kubermatic-bot added this to the v2.12 milestone Aug 26, 2019
@kubermatic-bot kubermatic-bot deleted the bump-machine-controller-2 branch August 26, 2019 16:48
@alvaroaleman
Copy link
Contributor Author

/cherrypick release/v2.11

@kubermatic-bot
Copy link
Contributor

@alvaroaleman: #4178 failed to apply on top of branch "release/v2.11":

Using index info to reconstruct a base tree...
M	api/Gopkg.lock
M	api/Gopkg.toml
M	api/pkg/resources/machinecontroller/deployment.go
M	api/pkg/resources/test/fixtures/deployment-aws-1.10.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.10.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.10.6-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.10.6-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.11.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.11.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.11.1-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.11.1-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.12.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.12.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.13.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-aws-1.13.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.10.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.10.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.10.6-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.10.6-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.11.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.11.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.11.1-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.11.1-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.12.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.12.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.13.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-azure-1.13.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.6-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.6-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.1-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.1-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.12.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.12.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.13.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-bringyourown-1.13.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.6-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.6-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.1-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.1-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.12.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.12.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.13.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-digitalocean-1.13.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.10.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.10.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.10.6-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.10.6-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.11.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.11.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.11.1-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.11.1-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.12.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.12.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.13.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-openstack-1.13.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.10.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.10.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.10.6-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.10.6-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.11.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.11.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.11.1-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.11.1-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.12.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.12.0-machine-controller.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.13.0-machine-controller-webhook.yaml
M	api/pkg/resources/test/fixtures/deployment-vsphere-1.13.0-machine-controller.yaml
M	api/vendor/github.com/kubermatic/machine-controller/pkg/userdata/helper/helper.go
Falling back to patching base and 3-way merge...
Auto-merging api/vendor/github.com/kubermatic/machine-controller/pkg/userdata/helper/helper.go
CONFLICT (content): Merge conflict in api/vendor/github.com/kubermatic/machine-controller/pkg/userdata/helper/helper.go
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.13.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.13.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.13.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.13.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.12.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.12.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.12.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.12.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.11.1-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.11.1-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.11.1-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.11.1-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.11.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.11.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.11.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.11.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.10.6-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.10.6-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.10.6-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.10.6-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.10.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.10.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.10.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.10.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.13.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.13.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.13.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.13.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.12.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.12.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.12.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.12.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.11.1-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.11.1-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.11.1-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.11.1-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.11.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.11.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.11.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.11.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.10.6-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.10.6-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.10.6-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.10.6-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.10.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.10.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.10.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.10.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.13.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.13.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.13.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.13.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.12.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.12.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.12.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.12.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.1-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.1-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.1-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.1-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.11.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.6-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.6-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.6-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.6-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.10.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.13.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.13.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.13.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.13.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.12.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.12.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.12.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.12.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.1-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.1-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.1-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.1-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.11.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.6-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.6-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.6-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.6-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.10.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.13.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.13.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.13.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.13.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.12.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.12.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.12.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.12.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.11.1-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.11.1-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.11.1-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.11.1-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.11.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.11.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.11.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.11.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.10.6-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.10.6-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.10.6-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.10.6-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.10.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.10.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.10.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.10.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.13.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.13.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.13.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.13.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.12.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.12.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.12.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.12.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.11.1-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.11.1-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.11.1-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.11.1-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.11.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.11.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.11.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.11.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.10.6-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.10.6-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.10.6-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.10.6-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.10.0-machine-controller.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.10.0-machine-controller.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.10.0-machine-controller-webhook.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.10.0-machine-controller-webhook.yaml
Auto-merging api/pkg/resources/machinecontroller/deployment.go
CONFLICT (content): Merge conflict in api/pkg/resources/machinecontroller/deployment.go
Auto-merging api/Gopkg.toml
CONFLICT (content): Merge conflict in api/Gopkg.toml
Auto-merging api/Gopkg.lock
CONFLICT (content): Merge conflict in api/Gopkg.lock
error: Failed to merge in the changes.
Patch failed at 0001 Update machine-controller to v1.5.4

In response to this:

/cherrypick release/v2.11

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
Reviewers
No reviews
Assignees

@kdomanski kdomanski

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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v2.12
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@alvaroaleman @kdomanski @kubermatic-bot