From 1a3898cdc4e8c35fe6b5a45d31cc06a52d2c041d Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Wed, 24 Jun 2020 19:39:37 +0200 Subject: [PATCH] daemon.json for docker, no service restart! --- k8s/{ => files}/etc_default_kubelet | 0 k8s/files/etc_docker_daemon.json | 12 ++++++++++++ k8s/init.sls | 10 +++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) rename k8s/{ => files}/etc_default_kubelet (100%) create mode 100644 k8s/files/etc_docker_daemon.json diff --git a/k8s/etc_default_kubelet b/k8s/files/etc_default_kubelet similarity index 100% rename from k8s/etc_default_kubelet rename to k8s/files/etc_default_kubelet diff --git a/k8s/files/etc_docker_daemon.json b/k8s/files/etc_docker_daemon.json new file mode 100644 index 0000000..2dd9abe --- /dev/null +++ b/k8s/files/etc_docker_daemon.json @@ -0,0 +1,12 @@ +{ + "exec-opts": ["native.cgroupdriver=systemd"], + "log-driver": "json-file", + "log-opts": { + "max-size": "100m" + }, + "storage-driver": "overlay2", + "insecure-registries" : [ + "docker-registry.lan" + ] +} + diff --git a/k8s/init.sls b/k8s/init.sls index a73b360..21b7dfb 100644 --- a/k8s/init.sls +++ b/k8s/init.sls @@ -8,11 +8,19 @@ include: /etc/default/kubelet: file.managed: - - source: salt://k8s/etc_default_kubelet + - source: salt://k8s/files/etc_default_kubelet - mode: 644 - user: root - group: root +/etc/docker/daemon.json: + file.managed: + - source: salt://k8s/files/etc_docker_daemon.json + - mode: 644 + - user: root + - group: root + + k8s_pkgs: pkg.installed: - pkgs: