Skip to content

Commit c52e3fb

Browse files
authored
fix: remove deprecated etcd-v2 flag (#5212)
1 parent f236aad commit c52e3fb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

microk8s-resources/default-args/etcd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
--trusted-ca-file=${SNAP_DATA}/certs/ca.crt
66
--cert-file=${SNAP_DATA}/certs/server.crt
77
--key-file=${SNAP_DATA}/certs/server.key
8-
--enable-v2=true

snap/hooks/configure

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,10 @@ then
407407
need_api_restart=true
408408
fi
409409

410-
if ! grep '\-\-enable\-v2' ${SNAP_DATA}/args/etcd
410+
# etcd --enable-v2 flag is removed after 3.6
411+
if grep -e "--enable-v2=" ${SNAP_DATA}/args/etcd
411412
then
412-
refresh_opt_in_config enable-v2 true etcd
413+
"${SNAP}/bin/sed" -i '/--enable-v2=/d' "$SNAP_DATA/args/etcd"
413414
snapctl restart ${SNAP_NAME}.daemon-etcd
414415
fi
415416

0 commit comments

Comments
 (0)