fix(argocd): Unconditionally start reposerver with uid_entrypoint.sh
While uid_entrypoint.sh contains the OpenShift specific manipulation of
/etc/passwd it also starts the reposerver via tini and so ensures that any
zombies produced by reposerver and its decendants are collected.
This matches the behaviour from the manifests included with the main ArgoCD
project. See:
* f93da5346c/manifests/base/repo-server/argocd-repo-server-deployment.yaml (L24)
* https://github.com/argoproj/argo-cd/pull/3721
* https://github.com/argoproj/argo-cd/issues/3611
This commit is contained in:
parent
ed19bc61e5
commit
00d3556bbd
2 changed files with 1 additions and 3 deletions
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
appVersion: 1.7.6
|
||||
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 2.8.0
|
||||
version: 2.8.1
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
keywords:
|
||||
|
|
|
@ -52,9 +52,7 @@ spec:
|
|||
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:
|
||||
{{- if .Values.openshift.enabled }}
|
||||
- uid_entrypoint.sh
|
||||
{{- end }}
|
||||
- argocd-repo-server
|
||||
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
|
||||
- --redis
|
||||
|
|
Loading…
Reference in a new issue