diff --git a/microk8s-resources/default-args/etcd b/microk8s-resources/default-args/etcd index 5b7532c259..80a4b770ab 100644 --- a/microk8s-resources/default-args/etcd +++ b/microk8s-resources/default-args/etcd @@ -5,4 +5,3 @@ --trusted-ca-file=${SNAP_DATA}/certs/ca.crt --cert-file=${SNAP_DATA}/certs/server.crt --key-file=${SNAP_DATA}/certs/server.key ---enable-v2=true diff --git a/snap/hooks/configure b/snap/hooks/configure index e14b7aedbb..77eb02f584 100755 --- a/snap/hooks/configure +++ b/snap/hooks/configure @@ -407,9 +407,10 @@ then need_api_restart=true fi -if ! grep '\-\-enable\-v2' ${SNAP_DATA}/args/etcd +# etcd --enable-v2 flag is removed after 3.6 +if grep -e "--enable-v2=" ${SNAP_DATA}/args/etcd then - refresh_opt_in_config enable-v2 true etcd + "${SNAP}/bin/sed" -i '/--enable-v2=/d' "$SNAP_DATA/args/etcd" snapctl restart ${SNAP_NAME}.daemon-etcd fi