DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): use $ as context for repository secret labels (#904)

Browse source 
Signed-off-by: Raphaël Pinson <raphael.pinson@camptocamp.com>
This commit is contained in:
Raphaël Pinson 2021-08-26 17:10:49 +02:00 committed by GitHub
parent 1b7d63fde9
commit 93a74912dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.1.1 appVersion: 2.1.1
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.17.2 version: 3.17.3
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-cd/assets/logo.png icon: https://argoproj.github.io/argo-cd/assets/logo.png
keywords: keywords:
@ -21,5 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Changed]: Upgrade argo-cd image to 2.1.1" - "[Fixed]: use $ as context for repository secret labels"
- "[Fixed]: Reenabling static assets for the argo-cd server"

2
charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
View file

@ -6,7 +6,7 @@ metadata:
name: argocd-repo-creds-{{ $repo_cred_key }} name: argocd-repo-creds-{{ $repo_cred_key }}
labels: labels:
argocd.argoproj.io/secret-type: repo-creds argocd.argoproj.io/secret-type: repo-creds
{{- include "argo-cd.labels" (dict "context" .) | nindent 4 }} {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
data: data:
{{- range $key, $value := $repo_cred_value }} {{- range $key, $value := $repo_cred_value }}
{{ $key }}: {{ $value | toString | b64enc }} {{ $key }}: {{ $value | toString | b64enc }}

2
charts/argo-cd/templates/argocd-configs/repository-secret.yaml
View file

@ -6,7 +6,7 @@ metadata:
name: argocd-repo-{{ $repo_key }} name: argocd-repo-{{ $repo_key }}
labels: labels:
argocd.argoproj.io/secret-type: repository argocd.argoproj.io/secret-type: repository
{{- include "argo-cd.labels" (dict "context" .) | nindent 4 }} {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
data: data:
{{- range $key, $value := $repo_value }} {{- range $key, $value := $repo_value }}
{{ $key }}: {{ $value | b64enc }} {{ $key }}: {{ $value | b64enc }}