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

Bind docker-ce-cli to the same version as docker-ce #759

Merged
merged 2 commits into from
May 20, 2020
Merged

Bind docker-ce-cli to the same version as docker-ce #759

merged 2 commits into from
May 20, 2020

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented May 19, 2020

What this PR does / why we need it:

This PR binds the docker-ce-cli package to the same version as the docker-ce package for Ubuntu, CentOS, and RHEL. As far as I know, there's nothing to do for CentOS/Flatcar and SLES. This is supposed to fix the incompatibilities between CLI and daemon.

Before this fix, the health-monitor script was logging the following error:

health-monitor.sh[23271]: Error response from daemon: client version 1.40 is too new. Maximum supported API version is 1.39

Relevant: kubermatic/kubeone#896

Optional Release Note:

Bind docker-ce-cli to the same version as docker-ce

/assign @kron4eg

@xmudrii xmudrii requested a review from kron4eg May 19, 2020 12:33
@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. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. labels May 19, 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 19, 2020
@xmudrii xmudrii changed the title Bind docker ce cli Bind docker-ce-cli to the same version as docker-ce May 19, 2020
@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5ed9dc07be024d7fb0a3e5183256308c4d67338a

@kubermatic-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

Also, here is a cat.
/meow

@kubermatic-bot
Copy link
Contributor

@kubermatic-triage-bot: cat image

In response to this:

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

Also, here is a cat.
/meow

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 May 19, 2020

/hold
to prevent retests

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 19, 2020
@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@xmudrii xmudrii force-pushed the bind-docker-ce-cli branch from 5c35416 to 91afd2b Compare May 19, 2020 16:02
@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label May 19, 2020
@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 7165187a64f47fedc9c960c080d8e227e1ffb2f4

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest
constantly no logs

irozzo-1A
irozzo-1A reviewed May 19, 2020
View reviewed changes
pkg/userdata/ubuntu/provider.go
@@ -271,6 +273,7 @@ write_files:
{{- /* If something failed during package installation but docker got installed, we need to put it on hold */}}
apt-mark hold docker.io || true
apt-mark hold docker-ce || true
apt-mark hold docker-ce-cli || true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a blocker but I would have done it in one single line:

apt-mark hold docker-ce docker-ce-cli || true

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point, but let's leave it for a follow-up along with CR_PKG. Tests are already running and I think we should try to get this merged as soon as possible.

@irozzo-1A
Copy link
Contributor

LGTM

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/test pull-machine-controller-e2e-deployment-upgrade
/test pull-machine-controller-yamllint
/test pull-kubermatic-machine-controller-validate-prow-yaml
re-running the jobs because they never started

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/test pull-kubermatic-machine-controller-validate-prow-yaml

1 similar comment
@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/test pull-kubermatic-machine-controller-validate-prow-yaml

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

3 similar comments
@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/test pull-machine-controller-e2e-kubevirt

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/test pull-machine-controller-e2e-vsphere

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/test pull-machine-controller-e2e-azure
/test pull-machine-controller-e2e-kubevirt

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/test pull-machine-controller-e2e-openstack

@kron4eg
Copy link
Member

kron4eg commented May 19, 2020

/retest

5 similar comments
@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@kron4eg
Copy link
Member

kron4eg commented May 19, 2020

/retest

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@xmudrii
Copy link
Member Author

xmudrii commented May 19, 2020

/retest

@kron4eg
Copy link
Member

kron4eg commented May 20, 2020

/hold cancel
/retest

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2020
@kubermatic-bot kubermatic-bot merged commit 23656f1 into kubermatic:master May 20, 2020
@irozzo-1A irozzo-1A mentioned this pull request May 20, 2020
Merged
@xmudrii
Copy link
Member Author

xmudrii commented May 20, 2020

/cherrypick release/v1.10

@kubermatic-bot
Copy link
Contributor

@xmudrii: #759 failed to apply on top of branch "release/v1.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/userdata/centos/provider.go
M	pkg/userdata/rhel/provider.go
M	pkg/userdata/ubuntu/provider.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/userdata/ubuntu/provider.go
CONFLICT (content): Merge conflict in pkg/userdata/ubuntu/provider.go
Auto-merging pkg/userdata/rhel/provider.go
CONFLICT (content): Merge conflict in pkg/userdata/rhel/provider.go
Auto-merging pkg/userdata/centos/provider.go
CONFLICT (content): Merge conflict in pkg/userdata/centos/provider.go
Patch failed at 0001 Bind docker-ce-cli to the same version as docker-ce

In response to this:

/cherrypick release/v1.10

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.

This was referenced May 20, 2020
Merged
Merged
Merged
@xmudrii xmudrii deleted the bind-docker-ce-cli branch July 25, 2022 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@irozzo-1A irozzo-1A irozzo-1A left review comments

@kron4eg kron4eg kron4eg approved these changes

Assignees

@kron4eg kron4eg

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. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@xmudrii @kubermatic-bot @kubermatic-triage-bot @irozzo-1A @kron4eg