diff --git a/charts/kubezero-network/values.yaml b/charts/kubezero-network/values.yaml index bad4f6c2..11d24f43 100644 --- a/charts/kubezero-network/values.yaml +++ b/charts/kubezero-network/values.yaml @@ -43,7 +43,7 @@ cilium: binPath: "/usr/libexec/cni" logFile: /var/log/cilium-cni.log #-- Ensure this is false if multus is enabled - exclusive: false + exclusive: true cluster: # This should match the second octet of clusterPoolIPv4PodCIDRList @@ -91,9 +91,11 @@ cilium: - key: node-role.kubernetes.io/control-plane effect: NoSchedule # the operator removes the taints, - # so we need to break chicken egg on single controller + # so we need to break chicken egg - key: node.cilium.io/agent-not-ready effect: NoSchedule + - key: node.kubernetes.io/not-ready + effect: NoSchedule nodeSelector: node-role.kubernetes.io/control-plane: "" diff --git a/charts/kubezero/templates/network.yaml b/charts/kubezero/templates/network.yaml index 61dfddf5..df6a3a02 100644 --- a/charts/kubezero/templates/network.yaml +++ b/charts/kubezero/templates/network.yaml @@ -1,6 +1,6 @@ {{- define "network-values" }} multus: - enabled: true + enabled: false clusterNetwork: "cilium" # {{- if eq .Values.global.platform "aws" }} diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index 8b6e3b98..36b70606 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -32,7 +32,7 @@ addons: network: enabled: true retain: true - targetRevision: 0.5.8 + targetRevision: 0.5.9 cilium: cluster: {}