diff --git a/argocd/app-of-apps/test/templates/applications.yaml b/argocd/app-of-apps/test/templates/applications.yaml index 05b5b75..e5a5d86 100644 --- a/argocd/app-of-apps/test/templates/applications.yaml +++ b/argocd/app-of-apps/test/templates/applications.yaml @@ -9,6 +9,10 @@ metadata: - resources-finalizer.argocd.argoproj.io spec: syncPolicy: + {{- if .serverSideApply }} + syncOptions: + - ServerSideApply=true + {{- end }} automated: prune: true destination: diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml index a427787..82ed2fa 100644 --- a/argocd/app-of-apps/test/values.yaml +++ b/argocd/app-of-apps/test/values.yaml @@ -35,6 +35,7 @@ applications: namespace: observability createNamespace: true repoURL: https://git.2martens.de/2martens/cloud-configuration.git + serverSideApply: true - name: prometheus-adapter project: default targetRevision: main diff --git a/argocd/prometheus/test/argocd_values.yaml b/argocd/prometheus/test/argocd_values.yaml index 71497da..d1727be 100644 --- a/argocd/prometheus/test/argocd_values.yaml +++ b/argocd/prometheus/test/argocd_values.yaml @@ -1,10 +1,4 @@ kube-prometheus-stack: - kube-state-metrics: - prometheus: - monitor: - enabled: true - selfMonitor: - enabled: true prometheus-node-exporter: hostRootFsMount: mountPropagation: None