From b8208adba4513f7322d0d9f051fe22907d759eca Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Thu, 21 Oct 2021 16:56:18 +0300 Subject: [PATCH 1/3] Move storage-dir argument to k8s-dqlite --- microk8s-resources/wrappers/run-kubelite-with-args | 2 +- snap/hooks/configure | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/microk8s-resources/wrappers/run-kubelite-with-args b/microk8s-resources/wrappers/run-kubelite-with-args index 8762199981..4fe923b8a6 100755 --- a/microk8s-resources/wrappers/run-kubelite-with-args +++ b/microk8s-resources/wrappers/run-kubelite-with-args @@ -47,7 +47,7 @@ done if [ -e ${SNAP_DATA}/args/ha-conf ] then - storage_param="$(get_opt_in_config '--storage-dir' 'kube-apiserver')" + storage_param="$(get_opt_in_config '--storage-dir' 'k8s-dqlite')" storage_dir="$(eval echo $storage_param)" if $(grep -qE "^failure-domain" "${SNAP_DATA}/args/ha-conf"); then val="$(get_opt_in_config 'failure-domain' 'ha-conf')" diff --git a/snap/hooks/configure b/snap/hooks/configure index 8b7792c0ba..12bc2e0eef 100755 --- a/snap/hooks/configure +++ b/snap/hooks/configure @@ -545,7 +545,11 @@ then refresh_opt_in_config etcd-servers unix://\${SNAP_DATA}/var/kubernetes/backend/kine.sock:12379 kube-apiserver skip_opt_in_config storage-backend kube-apiserver + + storage_dir="$(get_opt_in_config 'storage-dir' 'kube-apiserver')" skip_opt_in_config storage-dir kube-apiserver + refresh_opt_in_config storage-dir "$val" k8s-dqlite + snapctl restart ${SNAP_NAME}.daemon-k8s-dqlite fi From d4f5eff4b7c872b3d5d7e299559973828a13d10f Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Thu, 21 Oct 2021 19:28:59 +0300 Subject: [PATCH 2/3] Fix the config values --- snap/hooks/configure | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/snap/hooks/configure b/snap/hooks/configure index 12bc2e0eef..027cb93cda 100755 --- a/snap/hooks/configure +++ b/snap/hooks/configure @@ -546,9 +546,12 @@ then refresh_opt_in_config etcd-servers unix://\${SNAP_DATA}/var/kubernetes/backend/kine.sock:12379 kube-apiserver skip_opt_in_config storage-backend kube-apiserver - storage_dir="$(get_opt_in_config 'storage-dir' 'kube-apiserver')" + storage_dir="$(get_opt_in_config '--storage-dir' 'kube-apiserver')" + if ! [ -z $storage_dir ] + then + refresh_opt_in_config storage-dir "$storage_dir" k8s-dqlite + fi skip_opt_in_config storage-dir kube-apiserver - refresh_opt_in_config storage-dir "$val" k8s-dqlite snapctl restart ${SNAP_NAME}.daemon-k8s-dqlite From 5cac4c931446b6d65fbf669fa2c50dbbddd70c44 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Thu, 21 Oct 2021 19:31:08 +0300 Subject: [PATCH 3/3] Remove empty line --- snap/hooks/configure | 1 - 1 file changed, 1 deletion(-) diff --git a/snap/hooks/configure b/snap/hooks/configure index 027cb93cda..7b5fae4ef4 100755 --- a/snap/hooks/configure +++ b/snap/hooks/configure @@ -553,7 +553,6 @@ then fi skip_opt_in_config storage-dir kube-apiserver - snapctl restart ${SNAP_NAME}.daemon-k8s-dqlite fi