Skip to content

Commit fc26820

Browse files
feat: bump k8s-dqlite version v1.7.0 (#5144)
* feat: bump k8s-dqlite version v1.7.0 * Revert "Disable WatchList feature gate (#4773)"
1 parent c9079bd commit fc26820

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v1.3.1"
3+
echo "v1.7.0"

microk8s-resources/default-args/kube-apiserver

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,3 @@
2929
--admission-control-config-file=${SNAP_DATA}/args/admission-control-config-file.yaml
3030
--kubelet-certificate-authority=${SNAP_DATA}/certs/ca.crt
3131
--kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP
32-
33-
# Disable the watchlist feature until k8s-dqlite can handle it
34-
--feature-gates=WatchList=false

snap/hooks/configure

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -382,21 +382,6 @@ then
382382
need_api_restart=true
383383
fi
384384

385-
# Disable the watchlist feature until k8s-dqlite can handle it
386-
if ! grep -e "WatchList" ${SNAP_DATA}/args/kube-apiserver
387-
then
388-
if ! grep -e "--feature-gates=" ${SNAP_DATA}/args/kube-apiserver
389-
then
390-
echo "" >> ${SNAP_DATA}/args/kube-apiserver
391-
echo '--feature-gates=WatchList=false' >> ${SNAP_DATA}/args/kube-apiserver
392-
else
393-
# Find the line starting with --feature-gates= and append ,WatchList=false
394-
"${SNAP}/bin/sed" -i '/^--feature-gates=/ s/$/,WatchList=false/' "$SNAP_DATA/args/kube-apiserver"
395-
fi
396-
397-
need_api_restart=true
398-
fi
399-
400385
# RemoveSelfLink feature flag is removed after 1.24
401386
if grep -e "feature-gates=RemoveSelfLink" ${SNAP_DATA}/args/kube-apiserver
402387
then

0 commit comments

Comments
 (0)