From baa9b692655e386410d1a5308b32f6c81c6a79b1 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 5 Oct 2020 04:31:00 -0700
Subject: [PATCH] Latest argocd

---
 charts/kubezero-argo-cd/Chart.yaml                          | 6 +++---
 charts/kubezero-argo-cd/values.yaml                         | 5 ++++-
 .../templates/istio-authorization-policy.yaml               | 2 +-
 charts/kubezero-metrics/templates/istio-service.yaml        | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/charts/kubezero-argo-cd/Chart.yaml b/charts/kubezero-argo-cd/Chart.yaml
index 52dfb8bf..3e68bce3 100644
--- a/charts/kubezero-argo-cd/Chart.yaml
+++ b/charts/kubezero-argo-cd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 name: kubezero-argo-cd
-version: 0.5.3
+version: 0.5.4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -15,6 +15,6 @@ dependencies:
     version: ">= 0.1.3"
     repository: https://zero-down-time.github.io/kubezero/
   - name: argo-cd
-    version: 2.7.0
+    version: 2.8.0
     repository: https://argoproj.github.io/argo-helm
-kubeVersion: ">= 1.16.0"
+kubeVersion: ">= 1.17.0"
diff --git a/charts/kubezero-argo-cd/values.yaml b/charts/kubezero-argo-cd/values.yaml
index 0f01c2e1..9eb2f739 100644
--- a/charts/kubezero-argo-cd/values.yaml
+++ b/charts/kubezero-argo-cd/values.yaml
@@ -31,13 +31,14 @@ argo-cd:
 
   global:
     image:
-      tag: v1.7.5
+      tag: v1.7.7
 
   controller:
     args:
       statusProcessors: "4"
       operationProcessors: "2"
       appResyncPeriod: "300"
+    logFormat: json
 
     metrics:
       enabled: false
@@ -62,6 +63,7 @@ argo-cd:
         memory: 256Mi
 
   repoServer:
+    logFormat: json
     metrics:
       enabled: false
       serviceMonitor:
@@ -77,6 +79,7 @@ argo-cd:
       effect: NoSchedule
 
   server:
+    logFormat: json
     config:
       # argo-cd.server.config.url -- ArgoCD hostname to be exposed via Istio
       url: argocd.example.com
diff --git a/charts/kubezero-metrics/templates/istio-authorization-policy.yaml b/charts/kubezero-metrics/templates/istio-authorization-policy.yaml
index 29e832e4..e049957b 100644
--- a/charts/kubezero-metrics/templates/istio-authorization-policy.yaml
+++ b/charts/kubezero-metrics/templates/istio-authorization-policy.yaml
@@ -24,9 +24,9 @@ spec:
         hosts: ["{{ .Values.grafana.istio.url }}"]
 {{- end }}
 {{- end }}
----
 {{- if .Values.prometheus.istio.enabled }}
 {{- if .Values.prometheus.istio.ipBlocks }}
+---
 apiVersion: security.istio.io/v1beta1
 kind: AuthorizationPolicy
 metadata:
diff --git a/charts/kubezero-metrics/templates/istio-service.yaml b/charts/kubezero-metrics/templates/istio-service.yaml
index 366962e6..05d8f5e7 100644
--- a/charts/kubezero-metrics/templates/istio-service.yaml
+++ b/charts/kubezero-metrics/templates/istio-service.yaml
@@ -15,8 +15,8 @@ spec:
     - destination:
         host: metrics-grafana
 {{- end }}
----
 {{- if .Values.prometheus.istio.enabled }}
+---
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata: