Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion microk8s-resources/default-args/etcd
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions snap/hooks/configure
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down