Disable WatchList feature gate (#4773)

canonical · Dec 5, 2024 · 40fce49 · 40fce49
1 parent e9b0a2c
commit 40fce49
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/microk8s-resources/default-args/kube-apiserver b/microk8s-resources/default-args/kube-apiserver
@@ -29,3 +29,6 @@
 --admission-control-config-file=${SNAP_DATA}/args/admission-control-config-file.yaml
 --kubelet-certificate-authority=${SNAP_DATA}/certs/ca.crt
 --kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP
+
+# Disable the watchlist feature until k8s-dqlite can handle it
+--feature-gates=WatchList=false
diff --git a/snap/hooks/configure b/snap/hooks/configure
@@ -385,6 +385,20 @@ then
   need_api_restart=true
 fi
 
+# Disable the watchlist feature until k8s-dqlite can handle it
+if ! grep -e "WatchList" ${SNAP_DATA}/args/kube-apiserver
+then
+  if ! grep -e "--feature-gates=" ${SNAP_DATA}/args/kube-apiserver
+  then
+    echo '--feature-gates=WatchList=false' >> ${SNAP_DATA}/args/kube-apiserver
+  else
+    # Find the line starting with --feature-gates= and append ,WatchList=false
+    "${SNAP}/bin/sed" -i '/^--feature-gates=/ s/$/,WatchList=false/' "$SNAP_DATA/args/kube-apiserver"
+  fi
+
+  need_api_restart=true
+fi
+
 # RemoveSelfLink feature flag is removed after 1.24
 if grep -e "feature-gates=RemoveSelfLink" ${SNAP_DATA}/args/kube-apiserver
 then