Minor fixed for 1.26

This commit is contained in:
Stefan Reimer 2023-08-29 16:30:43 +00:00
parent 00990317d2
commit 2f5f07ecb1
4 changed files with 13 additions and 19 deletions

View File

@ -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 )

View File

@ -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

View File

@ -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 }}
# goaway-chance: ".001"
# {{- end }}
{{- if .Values.global.highAvailable }}
goaway-chance: ".001"
{{- end }}
logging-format: json
{{- with .Values.api.extraArgs }}
{{- toYaml . | nindent 4 }}

View File

@ -78,20 +78,8 @@ fluentd:
enabled: false
# No need for docker nor /var/log
volumes:
- name: etcfluentd-main
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/
mountVarLogDirectory: false
mountDockerContainersDirectory: false
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: