From 0db3a7561148b615816d6bef469cc003f0f4a84e Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 8 Apr 2024 18:09:22 +0000
Subject: [PATCH] fix: disable feature flag for now

---
 charts/kubeadm/templates/_helpers.tpl | 3 ++-
 charts/kubezero-network/values.yaml   | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/charts/kubeadm/templates/_helpers.tpl b/charts/kubeadm/templates/_helpers.tpl
index 5aafc4b1..88f32ed8 100644
--- a/charts/kubeadm/templates/_helpers.tpl
+++ b/charts/kubeadm/templates/_helpers.tpl
@@ -2,8 +2,9 @@
 {{- /* Issues: "MemoryQoS" */ -}}
 {{- /* v1.30?: "NodeSwap" */ -}}
 {{- /* v1.29: remove/beta now "SidecarContainers" */ -}}
+{{- /* v1.28: "PodAndContainerStatsFromCRI" still not working */ -}}
 {{- define "kubeadm.featuregates" }}
-{{- $gates := list "CustomCPUCFSQuotaPeriod" "SidecarContainers" "PodAndContainerStatsFromCRI" }}
+{{- $gates := list "CustomCPUCFSQuotaPeriod" "SidecarContainers" }}
 {{- if eq .return "csv" }}
 {{- range $key := $gates }}
 {{- $key }}=true,
diff --git a/charts/kubezero-network/values.yaml b/charts/kubezero-network/values.yaml
index 8c51a4c2..38892c34 100644
--- a/charts/kubezero-network/values.yaml
+++ b/charts/kubezero-network/values.yaml
@@ -84,6 +84,11 @@ cilium:
     tolerations:
     - key: node-role.kubernetes.io/control-plane
       effect: NoSchedule
+    # the operator removes the taints,
+    # so we need to break chicken egg on single controller
+    - key: node.cilium.io/agent-not-ready
+      effect: NoSchedule
+
     nodeSelector:
       node-role.kubernetes.io/control-plane: ""
     prometheus: