From 2a6ad93a76a50f91d6034852953b26725f71809c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 15 Sep 2021 10:53:32 -0500 Subject: [PATCH] qa/tasks/kubeadm: modify (do not clobber) daemon.json Otherwise we blow away the mirror config. Signed-off-by: Sage Weil --- qa/tasks/kubeadm.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/qa/tasks/kubeadm.py b/qa/tasks/kubeadm.py index 1a17beae062ea..b212d06d8f0b9 100644 --- a/qa/tasks/kubeadm.py +++ b/qa/tasks/kubeadm.py @@ -4,6 +4,7 @@ Kubernetes cluster task, deployed via kubeadm import argparse import contextlib import ipaddress +import json import logging import random import yaml @@ -58,18 +59,18 @@ def preflight(ctx, config): # set docker cgroup driver = systemd # see https://kubernetes.io/docs/setup/production-environment/container-runtimes/#docker # see https://github.com/kubernetes/kubeadm/issues/2066 - daemon_json = """ -{ - "exec-opts": ["native.cgroupdriver=systemd"], - "log-driver": "json-file", - "log-opts": { - "max-size": "100m" - }, - "storage-driver": "overlay2" -} -""" for remote in ctx.cluster.remotes.keys(): - remote.write_file('/etc/docker/daemon.json', daemon_json, sudo=True) + try: + orig = remote.read_file('/etc/docker/daemon.json', sudo=True) + j = json.loads(orig) + except Exception as e: + log.info(f'Failed to pull old daemon.json: {e}') + j = {} + j["exec-opts"] = ["native.cgroupdriver=systemd"] + j["log-driver"] = "json-file" + j["log-opts"] = {"max-size": "100m"} + j["storage-driver"] = "overlay2" + remote.write_file('/etc/docker/daemon.json', json.dumps(j), sudo=True) run.wait( ctx.cluster.run( args=[ -- 2.39.5