fix: set argocd server-side options correctly

This commit is contained in:
Stefan Reimer 2025-06-06 12:33:48 +00:00
parent cc9983742d
commit 7f1d4333d7
4 changed files with 11 additions and 6 deletions

View File

@ -26,6 +26,7 @@ spec:
prune: true prune: true
syncOptions: syncOptions:
- ApplyOutOfSyncOnly=true - ApplyOutOfSyncOnly=true
- ServerSideApply=true
info: info:
- name: "Source:" - name: "Source:"
value: "https://git.zero-downtime.net/ZeroDownTime/KubeZero/src/branch/release/v1.32/" value: "https://git.zero-downtime.net/ZeroDownTime/KubeZero/src/branch/release/v1.32/"

View File

@ -1,6 +1,9 @@
kyverno: kyverno:
enabled: false enabled: false
# templating:
# enabled: true
admissionController: admissionController:
revisionHistoryLimit: 2 revisionHistoryLimit: 2
@ -18,8 +21,8 @@ kyverno:
backgroundController: backgroundController:
enabled: false enabled: false
cleanupController: # cleanupController:
enabled: false # enabled: false
reportsController: reportsController:
enabled: false enabled: false

View File

@ -10,7 +10,7 @@ metadata:
labels: labels:
{{- include "kubezero-lib.labels" . | nindent 4 }} {{- include "kubezero-lib.labels" . | nindent 4 }}
annotations: annotations:
argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true argocd.argoproj.io/compare-options: IncludeMutationWebhook=true
# argocd.argoproj.io/sync-options: Replace=true # argocd.argoproj.io/sync-options: Replace=true
{{- with ( index .Values $name "annotations" ) }} {{- with ( index .Values $name "annotations" ) }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
@ -42,6 +42,7 @@ spec:
syncOptions: syncOptions:
- CreateNamespace=true - CreateNamespace=true
- ApplyOutOfSyncOnly=true - ApplyOutOfSyncOnly=true
- ServerSideApply=true
info: info:
- name: "Source:" - name: "Source:"
value: "https://git.zero-downtime.net/ZeroDownTime/KubeZero/src/branch/release/v1.31/charts/kubezero-{{ $name }}" value: "https://git.zero-downtime.net/ZeroDownTime/KubeZero/src/branch/release/v1.31/charts/kubezero-{{ $name }}"

View File

@ -10,9 +10,9 @@ argo-cd:
params: params:
{{- if not $.Values.global.highAvailable }} {{- if not $.Values.global.highAvailable }}
# Reduce load on API server on single node control plane # Reduce load on API server on single node control plane
controller.status.processors: 2 controller.status.processors: 4
controller.operation.processors: 1 controller.operation.processors: 2
controller.kubectl.parallelism.limit: 1 controller.kubectl.parallelism.limit: 2
{{- else }} {{- else }}
controller.status.processors: 8 controller.status.processors: 8
controller.operation.processors: 4 controller.operation.processors: 4