From 3f059773bd3690f1189794cc1b61feca1bb8ed6e Mon Sep 17 00:00:00 2001 From: Aditya Menon Date: Mon, 23 Aug 2021 02:10:27 +0200 Subject: [PATCH] Remove ArgoCD repo server entrypoint script from command block This ensures we use the entrypoint defined in the Dockerfile Signed-off-by: Aditya Menon --- charts/argo-cd/Chart.yaml | 6 +++--- charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 3 +-- charts/argo-cd/values.yaml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 322cd0c0..aae74683 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 2.0.5 +appVersion: 2.1.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.12.1 +version: 3.13.0 home: https://github.com/argoproj/argo-helm icon: https://argoproj.github.io/argo-cd/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Fixed]: redis-ha.nameOverride / redis-ha.fullnameOverride breaks the ArgoCD helm chart" + - "[Fixed]: Remove ArgoCD Repo Server entrypoint file from command block. Defers to entrypoint defined in the Dockerfile" diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 30082b2d..d89440a2 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -40,8 +40,7 @@ spec: - name: {{ .Values.repoServer.name }} image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }} imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }} - command: - - uid_entrypoint.sh + args: - argocd-repo-server {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }} - --redis diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 4a6172ef..9d151842 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -8,7 +8,7 @@ kubeVersionOverride: "" global: image: repository: quay.io/argoproj/argocd - tag: v2.0.5 + tag: v2.1.0 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999