lowering the argocd to 2.2.5 docker tag, 2.3.x failes with mounting d…

…iff value file from another git repo argoproj/argo-cd#2789 (comment)
Obmondo · Apr 7, 2022 · 533d96a · 533d96a
1 parent 075ead1
commit 533d96a
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 1,084 deletions.
diff --git a/argocd-helm-charts/argo-cd/Chart.yaml b/argocd-helm-charts/argo-cd/Chart.yaml
@@ -3,7 +3,5 @@ name: argo-cd
 version: 2.2.2
 dependencies:
   - name: argo-cd
-    version: 4.4.0
+    version: 3.35.4
     repository: https://argoproj.github.io/argo-helm
-    #repository: "oci://ghcr.io/Obmondo"
-    # see versions here: https://github.com/argoproj/argo-helm/blob/master/charts/argo-cd/Chart.yaml
diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/Chart.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/Chart.yaml
@@ -1,14 +1,14 @@
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Ability to use external/existing Redis (eg. a managed cloud service)"
+    - "[Fixed]: ArgoCD application controller metric application label templating"
 apiVersion: v2
-appVersion: v2.3.3
+appVersion: v2.2.5
 dependencies:
 - condition: redis-ha.enabled
   name: redis-ha
   repository: https://dandydeveloper.github.io/charts/
   version: 4.12.17
-description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool
+description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool
   for Kubernetes.
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
@@ -22,4 +22,4 @@ maintainers:
 - name: jessesuen
 - name: seanson
 name: argo-cd
-version: 4.4.0
+version: 3.35.4
diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/README.md b/argocd-helm-charts/argo-cd/charts/argo-cd/README.md
diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/crds/crd-application.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/crds/crd-application.yaml
@@ -233,11 +233,6 @@ spec:
                                   type: string
                               type: object
                             type: array
-                          ignoreMissingValueFiles:
-                            description: IgnoreMissingValueFiles prevents helm template
-                              from failing when valueFiles do not exist locally by
-                              not appending them to helm template --values
-                            type: boolean
                           parameters:
                             description: Parameters is a list of Helm parameters which
                               are passed to the helm template command upon manifest
@@ -266,10 +261,6 @@ spec:
                             description: ReleaseName is the Helm release name to use.
                               If omitted it will use the application name
                             type: string
-                          skipCrds:
-                            description: SkipCrds skips custom resource definition
-                              installation step (Helm's --skip-crds)
-                            type: boolean
                           valueFiles:
                             description: ValuesFiles is a list of Helm value files
                               to use when generating a template
@@ -607,11 +598,6 @@ spec:
                               type: string
                           type: object
                         type: array
-                      ignoreMissingValueFiles:
-                        description: IgnoreMissingValueFiles prevents helm template
-                          from failing when valueFiles do not exist locally by not
-                          appending them to helm template --values
-                        type: boolean
                       parameters:
                         description: Parameters is a list of Helm parameters which
                           are passed to the helm template command upon manifest generation
@@ -639,10 +625,6 @@ spec:
                         description: ReleaseName is the Helm release name to use.
                           If omitted it will use the application name
                         type: string
-                      skipCrds:
-                        description: SkipCrds skips custom resource definition installation
-                          step (Helm's --skip-crds)
-                        type: boolean
                       valueFiles:
                         description: ValuesFiles is a list of Helm value files to
                           use when generating a template
@@ -984,11 +966,6 @@ spec:
                                     type: string
                                 type: object
                               type: array
-                            ignoreMissingValueFiles:
-                              description: IgnoreMissingValueFiles prevents helm template
-                                from failing when valueFiles do not exist locally
-                                by not appending them to helm template --values
-                              type: boolean
                             parameters:
                               description: Parameters is a list of Helm parameters
                                 which are passed to the helm template command upon
@@ -1018,10 +995,6 @@ spec:
                               description: ReleaseName is the Helm release name to
                                 use. If omitted it will use the application name
                               type: string
-                            skipCrds:
-                              description: SkipCrds skips custom resource definition
-                                installation step (Helm's --skip-crds)
-                              type: boolean
                             valueFiles:
                               description: ValuesFiles is a list of Helm value files
                                 to use when generating a template
@@ -1376,12 +1349,6 @@ spec:
                                           type: string
                                       type: object
                                     type: array
-                                  ignoreMissingValueFiles:
-                                    description: IgnoreMissingValueFiles prevents
-                                      helm template from failing when valueFiles do
-                                      not exist locally by not appending them to helm
-                                      template --values
-                                    type: boolean
                                   parameters:
                                     description: Parameters is a list of Helm parameters
                                       which are passed to the helm template command
@@ -1414,10 +1381,6 @@ spec:
                                       to use. If omitted it will use the application
                                       name
                                     type: string
-                                  skipCrds:
-                                    description: SkipCrds skips custom resource definition
-                                      installation step (Helm's --skip-crds)
-                                    type: boolean
                                   valueFiles:
                                     description: ValuesFiles is a list of Helm value
                                       files to use when generating a template
@@ -1751,11 +1714,6 @@ spec:
                                       type: string
                                   type: object
                                 type: array
-                              ignoreMissingValueFiles:
-                                description: IgnoreMissingValueFiles prevents helm
-                                  template from failing when valueFiles do not exist
-                                  locally by not appending them to helm template --values
-                                type: boolean
                               parameters:
                                 description: Parameters is a list of Helm parameters
                                   which are passed to the helm template command upon
@@ -1786,10 +1744,6 @@ spec:
                                 description: ReleaseName is the Helm release name
                                   to use. If omitted it will use the application name
                                 type: string
-                              skipCrds:
-                                description: SkipCrds skips custom resource definition
-                                  installation step (Helm's --skip-crds)
-                                type: boolean
                               valueFiles:
                                 description: ValuesFiles is a list of Helm value files
                                   to use when generating a template
@@ -2111,11 +2065,6 @@ spec:
                                       type: string
                                   type: object
                                 type: array
-                              ignoreMissingValueFiles:
-                                description: IgnoreMissingValueFiles prevents helm
-                                  template from failing when valueFiles do not exist
-                                  locally by not appending them to helm template --values
-                                type: boolean
                               parameters:
                                 description: Parameters is a list of Helm parameters
                                   which are passed to the helm template command upon
@@ -2146,10 +2095,6 @@ spec:
                                 description: ReleaseName is the Helm release name
                                   to use. If omitted it will use the application name
                                 type: string
-                              skipCrds:
-                                description: SkipCrds skips custom resource definition
-                                  installation step (Helm's --skip-crds)
-                                type: boolean
                               valueFiles:
                                 description: ValuesFiles is a list of Helm value files
                                   to use when generating a template

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/_helpers.tpl b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/_helpers.tpl
@@ -67,20 +67,6 @@ Create argocd repo-server name and version as used by the chart label.
 {{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.repoServer.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create argocd application set name and version as used by the chart label.
-*/}}
-{{- define "argo-cd.applicationSet.fullname" -}}
-{{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.applicationSet.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create argocd notifications name and version as used by the chart label.
-*/}}
-{{- define "argo-cd.notifications.fullname" -}}
-{{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.notifications.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
 {{/*
 Create the name of the controller service account to use
 */}}
@@ -115,7 +101,7 @@ Create the name of the redis service account to use
 {{- end -}}
 
 {{/*
-Create the name of the Argo CD server service account to use
+Create the name of the ArgoCD server service account to use
 */}}
 {{- define "argo-cd.serverServiceAccountName" -}}
 {{- if .Values.server.serviceAccount.create -}}
@@ -136,39 +122,6 @@ Create the name of the repo-server service account to use
 {{- end -}}
 {{- end -}}
 
-{{/*
-Create the name of the application set service account to use
-*/}}
-{{- define "argo-cd.applicationSetServiceAccountName" -}}
-{{- if .Values.applicationSet.serviceAccount.create -}}
-    {{ default (include "argo-cd.applicationSet.fullname" .) .Values.applicationSet.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.applicationSet.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the notifications service account to use
-*/}}
-{{- define "argo-cd.notificationsServiceAccountName" -}}
-{{- if .Values.notifications.serviceAccount.create -}}
-    {{ default (include "argo-cd.notifications.fullname" .) .Values.notifications.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.notifications.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the notifications bots slack service account to use
-*/}}
-{{- define "argo-cd.notificationsBotsSlackServiceAccountName" -}}
-{{- if .Values.notifications.bots.slack.serviceAccount.create -}}
-    {{ default (include "argo-cd.notifications.fullname" .) .Values.notifications.bots.slack.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.notifications.bots.slack.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Create chart name and version as used by the chart label.
 */}}
@@ -224,7 +177,7 @@ Return the target Kubernetes version
   {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride }}
 {{- end -}}
 
-{{/*
+{{/* 
 Argo Configuration Preset Values (Incluenced by Values configuration)
 */}}
 {{- define "argo-cd.config.presets" -}}
@@ -233,7 +186,7 @@ ui.cssurl: "./custom/custom.styles.css"
   {{- end }}
 {{- end -}}
 
-{{/*
+{{/* 
 Merge Argo Configuration with Preset Configuration
 */}}
 {{- define "argo-cd.config" -}}
@@ -243,44 +196,8 @@ Merge Argo Configuration with Preset Configuration
 {{- end -}}
 
 {{/*
-Return the default Argo CD app version
+Return the default ArgoCD app version
 */}}
 {{- define "argo-cd.defaultTag" -}}
   {{- default .Chart.AppVersion .Values.global.image.tag }}
 {{- end -}}
-
-{{/*
-Create the name of the notifications controller secret to use
-*/}}
-{{- define "argo-cd.notifications.secretName" -}}
-{{- if .Values.notifications.secret.create -}}
-    {{ default (printf "%s-secret" (include "argo-cd.notifications.fullname" .)) .Values.notifications.secret.name }}
-{{- else -}}
-    {{ default "argocd-notifications-secret" .Values.notifications.secret.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the configmap to use
-*/}}
-{{- define "argo-cd.notifications.configMapName" -}}
-{{- if .Values.notifications.cm.create -}}
-    {{ default (printf "%s-cm" (include "argo-cd.notifications.fullname" .)) .Values.notifications.cm.name }}
-{{- else -}}
-    {{ default "argocd-notifications-cm" .Values.notifications.cm.name }}
-{{- end -}}
-{{- end -}}
-
-{{- define "argo-cd.redisPasswordEnv" -}}
-  {{- if or .Values.externalRedis.password .Values.externalRedis.existingSecret }}
-- name: REDIS_PASSWORD
-  valueFrom:
-    secretKeyRef:
-    {{- if .Values.externalRedis.existingSecret }}
-      name: {{ .Values.externalRedis.existingSecret }}
-    {{- else }}
-      name: {{ template "argo-cd.redis.fullname" . }}
-    {{- end }}
-      key: redis-password
-  {{- end }}
-{{- end -}}
diff --git a/...elm-charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/...elm-charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -65,9 +65,6 @@ spec:
         {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
-        {{- else if and .Values.externalRedis.host .Values.externalRedis.port }}
-        - --redis
-        - {{ .Values.externalRedis.host }}:{{ .Values.externalRedis.port }}
         {{- end }}
         {{- with .Values.controller.extraArgs }}
         {{- . | toYaml | nindent 8 }}
@@ -78,12 +75,9 @@ spec:
         {{- if .Values.controller.containerSecurityContext }}
         securityContext: {{- toYaml .Values.controller.containerSecurityContext | nindent 10 }}
         {{- end }}
-        {{- if or .Values.controller.env .Values.externalRedis.password .Values.externalRedis.existingSecret  }}
+        {{- if .Values.controller.env }}
         env:
-          {{- include "argo-cd.redisPasswordEnv" . | nindent 8 }}
-          {{- with .Values.controller.env }}
-          {{- toYaml . | nindent 8 }}
-          {{- end }}
+{{- toYaml .Values.controller.env | nindent 8 }}
         {{- end }}
         {{- with .Values.controller.envFrom }}
         envFrom: {{- toYaml . | nindent 8 }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -47,9 +47,6 @@ spec:
         {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
-        {{- else if and .Values.externalRedis.host .Values.externalRedis.port }}
-        - --redis
-        - {{ .Values.externalRedis.host }}:{{ .Values.externalRedis.port }}
         {{- end }}
         - --logformat
         - {{ .Values.repoServer.logFormat }}
@@ -68,10 +65,9 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-          {{- include "argo-cd.redisPasswordEnv" . | nindent 8 }}
-          {{- with .Values.repoServer.env }}
-          {{- toYaml . | nindent 8 }}
-          {{- end }}
+        {{- if .Values.repoServer.env }}
+          {{- toYaml .Values.repoServer.env | nindent 8 }}
+        {{- end }}
         {{- if .Values.openshift.enabled }}
         - name: USER_NAME
           value: argocd

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-repo-server/networkpolicy.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-repo-server/networkpolicy.yaml
@@ -14,16 +14,6 @@ spec:
     - podSelector:
         matchLabels:
           {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 10 }}
-    {{- if .Values.notifications.enabled }}
-    - podSelector:
-        matchLabels:
-          {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 10 }}
-    {{- end }}
-    {{- if .Values.applicationSet.enabled }}
-    - podSelector:
-        matchLabels:
-          {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 10 }}
-    {{- end }}
     ports:
     - port: repo-server
       protocol: TCP

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-server/deployment.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -59,22 +59,16 @@ spec:
         {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
-        {{- else if and .Values.externalRedis.host .Values.externalRedis.port }}
-        - --redis
-        - {{ .Values.externalRedis.host }}:{{ .Values.externalRedis.port }}
         {{- end }}
         {{- with .Values.server.extraArgs }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}
         {{- if .Values.server.containerSecurityContext }}
         securityContext: {{- toYaml .Values.server.containerSecurityContext | nindent 10 }}
         {{- end }}
-        {{- if or .Values.server.env .Values.externalRedis.password .Values.externalRedis.existingSecret }}
+        {{- if .Values.server.env }}
         env:
-          {{- include "argo-cd.redisPasswordEnv" . | nindent 8 }}
-          {{- with .Values.server.env }}
-          {{- toYaml . | nindent 8 }}
-          {{- end }}
+{{- toYaml .Values.server.env | nindent 8 }}
         {{- end }}
         {{- with .Values.server.envFrom }}
         envFrom: {{- toYaml . | nindent 8 }}