Skip to content

Converge docker.json config usage across operating systems #712

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
merged 2 commits into from
Mar 20, 2020
Merged

Converge docker.json config usage across operating systems #712

merged 2 commits into from
Mar 20, 2020

Conversation

@kron4eg
Copy link
Member

@kron4eg kron4eg commented Mar 18, 2020 •
edited
Loading

What this PR does / why we need it:

  • consistently use dockerConfig across OS in userdata
  • install the same docker version where possible
  • use "max-size":"100m" as docker log limit everywhere
NONE

@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. 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. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 18, 2020
@kron4eg kron4eg requested a review from moadqassem March 18, 2020 16:39
@kron4eg kron4eg force-pushed the docker-daemon-json branch from bc1cefc to 2b7501b Compare March 18, 2020 21:00
@kron4eg
Converge docker.json config usage across operating systems
2a69723 
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@kron4eg kron4eg force-pushed the docker-daemon-json branch from 2b7501b to 2a69723 Compare March 18, 2020 21:23
@moadqassem
Copy link
Member

moadqassem commented Mar 19, 2020

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

moadqassem
moadqassem reviewed Mar 19, 2020
View reviewed changes
pkg/userdata/helper/helper.go
RegistryMirrors []string `json:"registry-mirrors"`
ExecOpts []string `json:"exec-opts,omitempty"`
StorageDriver string `json:"storage-driver,omitempty"`
StorageOpts []string `json:"storage-opts,omitempty"`
Copy link
Member

@moadqassem moadqassem Mar 19, 2020

Choose a reason for hiding this comment

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

Where this field is used?

Copy link
Member Author

@kron4eg kron4eg Mar 19, 2020

Choose a reason for hiding this comment

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

it was intended for RHEL, but since it works without it it's not used currently

@kron4eg
Drop unneeded comment from centos userdata
b5d8354 
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@moadqassem
Copy link
Member

moadqassem commented Mar 19, 2020

/retest

@moadqassem
Copy link
Member

moadqassem commented Mar 19, 2020

/test pull-machine-controller-e2e-alibaba

@kron4eg
Copy link
Member Author

kron4eg commented Mar 19, 2020

alibaba fails with

admission webhook "machinedeployments.machine-controller.kubermatic.io" denied the request: defaulting or validation failed: validation failed: invalid/not supported operating system specified "centos": os not supported

@moadqassem
Copy link
Member

moadqassem commented Mar 19, 2020

edeployments.machine-controller.kubermati

Yeah that's ok, we can forget about this error for now Since it is not relevant to the PR :)

@moadqassem
Copy link
Member

moadqassem commented Mar 19, 2020

/approve
/lgtm

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

kubermatic-bot commented Mar 19, 2020

LGTM label has been added.

Git tree hash: e07971f8f8f8edbe935825fb5fc995cea2770fa8

@kubermatic-bot
Copy link
Contributor

kubermatic-bot commented Mar 19, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg, moadqassem

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

@kron4eg
Copy link
Member Author

kron4eg commented Mar 19, 2020

/test pull-machine-controller-e2e-gce
/override pull-machine-controller-e2e-alibaba

@kubermatic-bot
Copy link
Contributor

kubermatic-bot commented Mar 19, 2020

@kron4eg: kron4eg unauthorized: /override is restricted to Repo administrators.

In response to this:

/test pull-machine-controller-e2e-gce
/override pull-machine-controller-e2e-alibaba

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-triage-bot
Copy link

kubermatic-triage-bot commented Mar 19, 2020

/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-bot commented Mar 19, 2020

@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.

@kron4eg
Copy link
Member Author

kron4eg commented Mar 19, 2020

/test pull-machine-controller-e2e-gce

1 similar comment
@kron4eg
Copy link
Member Author

kron4eg commented Mar 19, 2020

/test pull-machine-controller-e2e-gce

@kubermatic-triage-bot
Copy link

kubermatic-triage-bot commented Mar 20, 2020

/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-bot commented Mar 20, 2020

@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.

@kubermatic-triage-bot
Copy link

kubermatic-triage-bot commented Mar 20, 2020

/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-bot commented Mar 20, 2020

@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.

@kubermatic-triage-bot
Copy link

kubermatic-triage-bot commented Mar 20, 2020

/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-bot commented Mar 20, 2020

@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.

@kubermatic-bot
Copy link
Contributor

kubermatic-bot commented Mar 20, 2020 •
edited
Loading

@kron4eg: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-machine-controller-e2e-azure 2a69723 link /test pull-machine-controller-e2e-azure
pull-machine-controller-e2e-alibaba b5d8354 link /test pull-machine-controller-e2e-alibaba

Full PR test history

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. I understand the commands that are listed here.

@kubermatic-bot kubermatic-bot merged commit f72a2ac into kubermatic:master Mar 20, 2020
@kron4eg kron4eg deleted the docker-daemon-json branch May 15, 2020 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@moadqassem moadqassem moadqassem left review comments

Assignees

@moadqassem moadqassem

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-none Denotes a PR that doesn't merit a release note. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. 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.

4 participants

@kron4eg @moadqassem @kubermatic-bot @kubermatic-triage-bot