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

Merged
merged 2 commits into from
Mar 20, 2020
Merged

Converge docker.json config usage across operating systems #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a69723
Converge docker.json config usage across operating systems
kron4eg Mar 18, 2020
b5d8354
Drop unneeded comment from centos userdata
kron4eg Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions pkg/userdata/centos/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,10 @@ write_files:
hostnamectl set-hostname {{ .MachineSpec.Name }}
{{ end }}

yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand All @@ -201,8 +204,6 @@ write_files:
{{- if eq .CloudProviderName "vsphere" }}
systemctl enable --now vmtoolsd.service
{{ end -}}
{{- /* Without this, the conformance tests fail with differing tests causing it, the common denominator: They look for some string in container logs and get an empty log */ -}}
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -284,6 +285,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{{ dockerConfig .InsecureRegistries .RegistryMirrors | indent 4 }}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.10-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ write_files:
swapoff -a


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -97,7 +100,6 @@ write_files:
curl -Lfo /opt/bin/health-monitor.sh https://raw.githubusercontent.com/kubermatic/machine-controller/8b5b66e4910a6228dfaecccaa0a3b05ec4902f8e/pkg/userdata/scripts/health-monitor.sh
chmod +x /opt/bin/health-monitor.sh
fi
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -252,6 +254,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.11-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ write_files:
swapoff -a


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -97,7 +100,6 @@ write_files:
curl -Lfo /opt/bin/health-monitor.sh https://raw.githubusercontent.com/kubermatic/machine-controller/8b5b66e4910a6228dfaecccaa0a3b05ec4902f8e/pkg/userdata/scripts/health-monitor.sh
chmod +x /opt/bin/health-monitor.sh
fi
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -252,6 +254,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.12-aws-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ write_files:
swapoff -a


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -97,7 +100,6 @@ write_files:
curl -Lfo /opt/bin/health-monitor.sh https://raw.githubusercontent.com/kubermatic/machine-controller/8b5b66e4910a6228dfaecccaa0a3b05ec4902f8e/pkg/userdata/scripts/health-monitor.sh
chmod +x /opt/bin/health-monitor.sh
fi
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -250,6 +252,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.12-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ write_files:
swapoff -a


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -97,7 +100,6 @@ write_files:
curl -Lfo /opt/bin/health-monitor.sh https://raw.githubusercontent.com/kubermatic/machine-controller/8b5b66e4910a6228dfaecccaa0a3b05ec4902f8e/pkg/userdata/scripts/health-monitor.sh
chmod +x /opt/bin/health-monitor.sh
fi
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -251,6 +253,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.12-vsphere-mirrors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ write_files:
hostnamectl set-hostname node1


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -112,7 +115,6 @@ write_files:
fi

systemctl enable --now vmtoolsd.service
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -268,6 +270,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"},"registry-mirrors":["https://registry.docker-cn.com"]}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.12-vsphere-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ write_files:
hostnamectl set-hostname node1


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -112,7 +115,6 @@ write_files:
fi

systemctl enable --now vmtoolsd.service
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -268,6 +270,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"},"insecure-registries":["192.168.100.100:5000","10.0.0.1:5000"]}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.12-vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ write_files:
hostnamectl set-hostname node1


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -104,7 +107,6 @@ write_files:
fi

systemctl enable --now vmtoolsd.service
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -259,6 +261,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/userdata/centos/testdata/kubelet-v1.9-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ write_files:
swapoff -a


yum install -y docker-1.13.1 \
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

yum install -y docker-ce-18.09.9-3.el7 \
ebtables \
ethtool \
nfs-utils \
Expand Down Expand Up @@ -97,7 +100,6 @@ write_files:
curl -Lfo /opt/bin/health-monitor.sh https://raw.githubusercontent.com/kubermatic/machine-controller/8b5b66e4910a6228dfaecccaa0a3b05ec4902f8e/pkg/userdata/scripts/health-monitor.sh
chmod +x /opt/bin/health-monitor.sh
fi
sed -i 's/journald/json-file/g' /etc/sysconfig/docker
systemctl enable --now docker
systemctl enable --now kubelet
systemctl enable --now --no-block kubelet-healthcheck.service
Expand Down Expand Up @@ -252,6 +254,11 @@ write_files:
content: |
export PATH="/opt/bin:$PATH"

- path: /etc/docker/daemon.json
permissions: "0644"
content: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /etc/systemd/system/kubelet-healthcheck.service
permissions: "0644"
content: |
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/auto-update-openstack-kubelet-v-version-prefix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.10.3-auto-update-openstack-multiple-dns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.11.2-vsphere-static-ipconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.12.0-vsphere-mirrors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":["https://registry.docker-cn.com"]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"},"registry-mirrors":["https://registry.docker-cn.com"]}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.12.0-vsphere-overwrite-cloudconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.12.0-vsphere-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":["192.168.100.100:5000","10.0.0.1:5000"],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"},"insecure-registries":["192.168.100.100:5000","10.0.0.1:5000"]}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.15.0-vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.17.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.9.2-disable-auto-update-aws-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.9.2-disable-auto-update-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.9.2-disable-locksmith-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/coreos/testdata/v1.9.2-disable-update-engine-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ storage:
mode: 0644
contents:
inline: |
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","insecure-registries":[],"registry-mirrors":[]}
{"exec-opts":["native.cgroupdriver=systemd"],"storage-driver":"overlay2","log-driver":"json-file","log-opts":{"max-size":"100m"}}

- path: /opt/bin/download.sh
filesystem: root
Expand Down
Loading