fix: rename parameter to be more readable.

fix: resolve conflicts
refactor: moves secrets to argocd-configs folder
Signed-off-by: Emanuel Oliveira <emanuelolive@grupoboticario.com.br>

Signed-off-by: Emanuel Oliveira <emanuelolive@grupoboticario.com.br>
This commit is contained in:
Emanuel Oliveira 2021-08-23 09:58:48 -03:00
parent 299bfef189
commit 07c02cd808
5 changed files with 7 additions and 7 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.1.0 appVersion: 2.1.0
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.13.0 version: 3.14.0
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:
@ -22,4 +22,4 @@ dependencies:
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Update]: Update to ArgoCD v2.1.0" - "[Update]: Update to ArgoCD v2.1.0"
- "[Feature]: Enable use of separated secret for repositories" - "[Feature]: Enable use of separated secret just for repositories"

View file

@ -1,8 +1,8 @@
{{- if .Values.configs.repositoryTemplates }} {{- if .Values.configs.credentialTemplates }}
apiVersion: v1 apiVersion: v1
kind: List kind: List
items: items:
{{- range $repo_cred_key, $repo_cred_value := .Values.configs.repositoryTemplates }} {{- range $repo_cred_key, $repo_cred_value := .Values.configs.credentialTemplates }}
- apiVersion: v1 - apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:

View file

@ -669,7 +669,7 @@ server:
# Argo CD instance label key # Argo CD instance label key
application.instanceLabelKey: argocd.argoproj.io/instance application.instanceLabelKey: argocd.argoproj.io/instance
# DEPRECATED: Please instead use configs.repositoryTemplates and configs.repositories # DEPRECATED: Please instead use configs.credentialTemplates and configs.repositories
# repositories: | # repositories: |
# - url: git@github.com:group/repo.git # - url: git@github.com:group/repo.git
# sshPrivateKeySecret: # sshPrivateKeySecret:
@ -1089,11 +1089,11 @@ configs:
# XWyb96wrUlv+E8I= # XWyb96wrUlv+E8I=
# -----END CERTIFICATE----- # -----END CERTIFICATE-----
## # Creates a secret with optional repository credentials ## # Creates a secret with optional repository credentials
## DEPRECATED: Instead, use configs.repositoryTemplates and/or configs.repositories ## DEPRECATED: Instead, use configs.credentialTemplates and/or configs.repositories
repositoryCredentials: {} repositoryCredentials: {}
## Creates a secret for each key/value specified below to create repository credentials ## Creates a secret for each key/value specified below to create repository credentials
repositoryTemplates: {} credentialTemplates: {}
# github-enterprise-creds-1: # github-enterprise-creds-1:
# url: https://github.com/argoproj # url: https://github.com/argoproj
# githubAppID: 1 # githubAppID: 1