From 03aecd7af94172b04e94a967662c62cb3b83103f Mon Sep 17 00:00:00 2001 From: Lars Fenneberg Date: Thu, 8 Oct 2020 06:18:44 +0000 Subject: [PATCH 1/3] fix(argocd): Unconditionally start reposerver with uid_entrypoint.sh (#466) * 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: * https://github.com/argoproj/argo-cd/blob/f93da5346c3dfe0ec75549fd78b2d30ce7d5cfad/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 * chore: Bumping minor semver as this feels like a bit more than a patch change. --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 2da7db6a..23544511 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -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.9.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/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index de6c21a3..a75c1283 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -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 From 12b4764afa91fbd3da0c08585c0d9c1cff9305b3 Mon Sep 17 00:00:00 2001 From: John Kost <41963650+johnkost@users.noreply.github.com> Date: Thu, 8 Oct 2020 13:24:46 -0400 Subject: [PATCH 2/3] fix: Add Ocp clusterrole (#341) * Update perms --- .../argo-rollouts/templates/argo-rollouts-clusterrole.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml index 8cfcdcc8..abc1a113 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml @@ -138,4 +138,10 @@ rules: verbs: - list - delete +- apiGroups: + - "*" + resources: + - "*/finalizers" + verbs: + - "*" {{- end }} From 6cf32933ffc7897231090528be965486b90a260e Mon Sep 17 00:00:00 2001 From: simonfr Date: Fri, 9 Oct 2020 00:11:01 +0200 Subject: [PATCH 3/3] feat: add extraContainers argument to deployment (#465) * add extraContainers argument * Update Chart.yaml * Update values.yaml * Update deployment.yaml --- charts/argo-cd/Chart.yaml | 2 +- .../templates/argocd-server/deployment.yaml | 3 +++ charts/argo-cd/values.yaml | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 23544511..fee54a18 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -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.9.0 +version: 2.9.1 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/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index b54b947f..aeec1579 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -120,6 +120,9 @@ spec: failureThreshold: {{ .Values.server.readinessProbe.failureThreshold }} resources: {{- toYaml .Values.server.resources | nindent 10 }} + {{- if .Values.server.extraContainers }} +{{- toYaml .Values.server.extraContainers | nindent 6 }} + {{- end }} {{- if .Values.server.nodeSelector }} nodeSelector: {{- toYaml .Values.server.nodeSelector | nindent 8 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index c87d0c79..70e146b0 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -653,6 +653,30 @@ server: # oauthclientCredentials: # secretName: argocd-secret + extraContainers: [] + ## Additional containers to be added to the controller pod. + ## See https://github.com/lemonldap-ng-controller/lemonldap-ng-controller as example. + # - name: my-sidecar + # image: nginx:latest + # - name: lemonldap-ng-controller + # image: lemonldapng/lemonldap-ng-controller:0.2.0 + # args: + # - /lemonldap-ng-controller + # - --alsologtostderr + # - --configmap=$(POD_NAMESPACE)/lemonldap-ng-configuration + # env: + # - name: POD_NAME + # valueFrom: + # fieldRef: + # fieldPath: metadata.name + # - name: POD_NAMESPACE + # valueFrom: + # fieldRef: + # fieldPath: metadata.namespace + # volumeMounts: + # - name: copy-portal-skins + # mountPath: /srv/var/lib/lemonldap-ng/portal/skins + ## Repo Server repoServer: name: repo-server