From 7c0e8f785e1609bfcfb33ca68667ea1bc5ca5d25 Mon Sep 17 00:00:00 2001 From: junnplus Date: Tue, 15 Dec 2020 15:03:03 +0800 Subject: [PATCH] feat(argo-cd): upgrade chart 3.0.0 Signed-off-by: junnplus --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 +- .../templates/argocd-application-controller/statefulset.yaml | 4 +++- charts/argo-cd/values.yaml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index df71ec8a..41a2c96f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.8.1 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.12.0 +version: 3.0.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index cebd0923..a9485f48 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -336,4 +336,4 @@ through `xxx.extraArgs` | redis-ha.haproxy.metrics.enabled | HAProxy enable prometheus metric scraping | `true` | | redis-ha.image.tag | Redis tag | `"5.0.8-alpine"` | -[gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/ \ No newline at end of file +[gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/ diff --git a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml index f264e26f..c2260c78 100644 --- a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml @@ -1,6 +1,6 @@ {{- $redisHa := (index .Values "redis-ha") -}} apiVersion: apps/v1 -kind: StatefulSet +kind: {{ .Values.controller.enableStatefulSet | ternary "StatefulSet" "Deployment" }} metadata: name: {{ template "argo-cd.controller.fullname" . }} labels: @@ -16,7 +16,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller app.kubernetes.io/instance: {{ .Release.Name }} + {{- if .Values.controller.enableStatefulSet }} serviceName: {{ template "argo-cd.controller.fullname" . }} + {{- end }} revisionHistoryLimit: 5 replicas: {{ .Values.controller.replicas }} template: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 8985bf57..234d46ad 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -36,7 +36,7 @@ controller: # Deploy the application as a StatefulSet instead of a Deployment, this is required for HA capability. # This is a feature flag that will become the default in chart version 3.x - enableStatefulSet: false + enableStatefulSet: true ## Argo controller commandline flags args: