feat: ArgoCD version bump to 2.X

charts/kubezero-argocd/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 name: kubezero-argocd
-version: 0.7.1
+version: 0.8.0
 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.17.4
+    version: 3.6.10
     repository: https://argoproj.github.io/argo-helm
 kubeVersion: ">= 1.18.0"

charts/kubezero-argocd/README.md

@@ -1,6 +1,6 @@
 # kubezero-argocd
 
-![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square)
+![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square)
 
 KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 
@@ -18,7 +18,7 @@ Kubernetes: `>= 1.18.0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://argoproj.github.io/argo-helm | argo-cd | 2.17.4 |
+| https://argoproj.github.io/argo-helm | argo-cd | 3.6.10 |
 | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
 
 ## Values
@@ -30,23 +30,22 @@ Kubernetes: `>= 1.18.0`
 | argo-cd.controller.args.statusProcessors | string | `"8"` |  |
 | argo-cd.controller.logFormat | string | `"json"` |  |
 | argo-cd.controller.metrics.enabled | bool | `false` |  |
-| argo-cd.controller.metrics.serviceMonitor.additionalLabels.release | string | `"metrics"` |  |
 | argo-cd.controller.metrics.serviceMonitor.enabled | bool | `true` |  |
 | argo-cd.controller.resources.requests.cpu | string | `"100m"` |  |
 | argo-cd.controller.resources.requests.memory | string | `"256Mi"` |  |
 | argo-cd.dex.enabled | bool | `false` |  |
-| argo-cd.global.image.tag | string | `"v1.8.7"` |  |
+| argo-cd.global.image.tag | string | `"v2.0.4"` |  |
 | argo-cd.installCRDs | bool | `false` |  |
 | argo-cd.repoServer.logFormat | string | `"json"` |  |
 | argo-cd.repoServer.metrics.enabled | bool | `false` |  |
-| argo-cd.repoServer.metrics.serviceMonitor.additionalLabels.release | string | `"metrics"` |  |
 | argo-cd.repoServer.metrics.serviceMonitor.enabled | bool | `true` |  |
 | argo-cd.server.config."resource.customizations" | string | `"cert-manager.io/Certificate:\n  # Lua script for customizing the health status assessment\n  health.lua: |\n    hs = {}\n    if obj.status ~= nil then\n      if obj.status.conditions ~= nil then\n        for i, condition in ipairs(obj.status.conditions) do\n          if condition.type == \"Ready\" and condition.status == \"False\" then\n            hs.status = \"Degraded\"\n            hs.message = condition.message\n            return hs\n          end\n          if condition.type == \"Ready\" and condition.status == \"True\" then\n            hs.status = \"Healthy\"\n            hs.message = condition.message\n            return hs\n          end\n        end\n      end\n    end\n    hs.status = \"Progressing\"\n    hs.message = \"Waiting for certificate\"\n    return hs\n"` |  |
+| argo-cd.server.config."ui.bannercontent" | string | `"KubeZero Release 2.20 incl. ArgoCD 2.0 -> Release notes"` |  |
+| argo-cd.server.config."ui.bannerurl" | string | `"https://blog.argoproj.io/argo-cd-v2-0-rc1-is-here-f7d21ff1aa64"` |  |
 | argo-cd.server.config.url | string | `"argocd.example.com"` | ArgoCD hostname to be exposed via Istio |
 | argo-cd.server.extraArgs[0] | string | `"--insecure"` |  |
 | argo-cd.server.logFormat | string | `"json"` |  |
 | argo-cd.server.metrics.enabled | bool | `false` |  |
-| argo-cd.server.metrics.serviceMonitor.additionalLabels.release | string | `"metrics"` |  |
 | argo-cd.server.metrics.serviceMonitor.enabled | bool | `true` |  |
 | argo-cd.server.service.servicePortHttpsName | string | `"grpc"` |  |
 | istio.enabled | bool | `false` | Deploy Istio VirtualService to expose ArgoCD |

charts/kubezero-argocd/dashboards.yaml

@@ -0,0 +1,8 @@
+configmap: grafana-dashboards
+gzip: true
+condition: 'index .Values "argo-cd" "controller" "metrics" "enabled"'
+dashboards:
+- name: ArgoCD
+  url: https://grafana.com/api/dashboards/14584/revisions/1/download
+  tags:
+  - ArgoCD

charts/kubezero-argocd/update.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Create ZDT dashboard configmap
+../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml

charts/kubezero-argocd/values.yaml

@@ -42,7 +42,7 @@ argo-cd:
 
   global:
     image:
-      tag: v1.8.7
+      tag: v2.0.4
 
   controller:
     args:
@@ -55,8 +55,6 @@ argo-cd:
       enabled: false
       serviceMonitor:
         enabled: true
-        additionalLabels:
-          release: metrics
 
     resources:
       # limits:
@@ -72,12 +70,13 @@ argo-cd:
       enabled: false
       serviceMonitor:
         enabled: true
-        additionalLabels:
-          release: metrics
 
   server:
     logFormat: json
     config:
+      ui.bannercontent: "KubeZero Release 2.20 incl. ArgoCD 2.0 -> Release notes"
+      ui.bannerurl: "https://blog.argoproj.io/argo-cd-v2-0-rc1-is-here-f7d21ff1aa64"
+
       # argo-cd.server.config.url -- ArgoCD hostname to be exposed via Istio
       url: argocd.example.com
 
@@ -117,8 +116,6 @@ argo-cd:
       enabled: false
       serviceMonitor:
         enabled: true
-        additionalLabels:
-          release: metrics
 
     extraArgs:
     - --insecure