Minor fixed for 1.26

admin/dev_apply.sh

@@ -4,7 +4,7 @@
 set -x
 
 #VERSION="latest"
-KUBE_VERSION="v1.26.6"
+KUBE_VERSION="v1.26.8"
 WORKDIR=$(mktemp -p /tmp -d kubezero.XXX)
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

admin/upgrade_cluster.sh

@@ -157,6 +157,9 @@ waitSystemPodsRunning
 
 echo "Applying remaining KubeZero modules..."
 
+# Delete fluent-bit DS being all weird
+kubectl delete ds logging-fluent-bit -n logging || true
+
 control_plane_upgrade "apply_cert-manager, apply_istio, apply_istio-ingress, apply_istio-private-ingress, apply_logging, apply_metrics, apply_argocd"
 
 # Trigger backup of upgraded cluster state

charts/kubeadm/templates/ClusterConfiguration.yaml

@@ -76,9 +76,9 @@ apiServer:
     {{- end }}
     feature-gates: {{ include "kubeadm.featuregates" ( dict "return" "csv" ) | trimSuffix "," | quote }}
     enable-admission-plugins: DenyServiceExternalIPs,NodeRestriction,EventRateLimit,ExtendedResourceToleration
-    # {{- if .Values.global.highAvailable }}
+    {{- if .Values.global.highAvailable }}
-    # goaway-chance: ".001"
+    goaway-chance: ".001"
-    # {{- end }}
+    {{- end }}
     logging-format: json
     {{- with .Values.api.extraArgs }}
     {{- toYaml . | nindent 4 }}

charts/kubezero-logging/values.yaml

@@ -78,20 +78,8 @@ fluentd:
     enabled: false
 
   # No need for docker nor /var/log
-  volumes:
+  mountVarLogDirectory: false
-  - name: etcfluentd-main
+  mountDockerContainersDirectory: false
-    configMap:
-      name: fluentd-main
-      defaultMode: 0777
-  - name: etcfluentd-config
-    configMap:
-      name: fluentd-config
-      defaultMode: 0777
-  volumeMounts:
-  - name: etcfluentd-main
-    mountPath: /etc/fluent
-  - name: etcfluentd-config
-    mountPath: /etc/fluent/config.d/
 
   resources:
     requests:
@@ -119,6 +107,9 @@ fluentd:
         name: logging-es-elastic-user
         key: elastic
 
+  configMapConfigs:
+    - fluentd-prometheus-conf
+
   fileConfigs:
     00_system.conf: |-
       <system>
@@ -268,7 +259,7 @@ fluent-bit:
       cpu: 20m
       memory: 32Mi
     limits:
-      memory: 64Mi
+      memory: 128Mi
 
   config:
     output: