From 07c02cd8081aa0dab5f000535d0ba24a23f0764a Mon Sep 17 00:00:00 2001
From: Emanuel Oliveira <emanuelolive@grupoboticario.com.br>
Date: Mon, 23 Aug 2021 09:58:48 -0300
Subject: [PATCH] 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>
---
 charts/argo-cd/Chart.yaml                                   | 4 ++--
 .../repository-credentials-secret-legacy.yaml               | 0
 .../repository-credentials-secret.yaml                      | 4 ++--
 .../repository-secret.yaml                                  | 0
 charts/argo-cd/values.yaml                                  | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename charts/argo-cd/templates/{argocd-repo-server => argocd-configs}/repository-credentials-secret-legacy.yaml (100%)
 rename charts/argo-cd/templates/{argocd-repo-server => argocd-configs}/repository-credentials-secret.yaml (78%)
 rename charts/argo-cd/templates/{argocd-repo-server => argocd-configs}/repository-secret.yaml (100%)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 7c16de47..0ff2dcef 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.1.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.13.0
+version: 3.14.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -22,4 +22,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - "[Update]: Update to ArgoCD v2.1.0"
-    - "[Feature]: Enable use of separated secret for repositories"
\ No newline at end of file
+    - "[Feature]: Enable use of separated secret just for repositories"
diff --git a/charts/argo-cd/templates/argocd-repo-server/repository-credentials-secret-legacy.yaml b/charts/argo-cd/templates/argocd-configs/repository-credentials-secret-legacy.yaml
similarity index 100%
rename from charts/argo-cd/templates/argocd-repo-server/repository-credentials-secret-legacy.yaml
rename to charts/argo-cd/templates/argocd-configs/repository-credentials-secret-legacy.yaml
diff --git a/charts/argo-cd/templates/argocd-repo-server/repository-credentials-secret.yaml b/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
similarity index 78%
rename from charts/argo-cd/templates/argocd-repo-server/repository-credentials-secret.yaml
rename to charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
index a6c222a1..86103b27 100644
--- a/charts/argo-cd/templates/argocd-repo-server/repository-credentials-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
@@ -1,8 +1,8 @@
-{{- if .Values.configs.repositoryTemplates }}
+{{- if .Values.configs.credentialTemplates }}
 apiVersion: v1
 kind: List
 items:
-{{- range $repo_cred_key, $repo_cred_value := .Values.configs.repositoryTemplates }}
+{{- range $repo_cred_key, $repo_cred_value := .Values.configs.credentialTemplates }}
   - apiVersion: v1
     kind: Secret
     metadata:
diff --git a/charts/argo-cd/templates/argocd-repo-server/repository-secret.yaml b/charts/argo-cd/templates/argocd-configs/repository-secret.yaml
similarity index 100%
rename from charts/argo-cd/templates/argocd-repo-server/repository-secret.yaml
rename to charts/argo-cd/templates/argocd-configs/repository-secret.yaml
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 2218e969..2254b3d6 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -669,7 +669,7 @@ server:
     # Argo CD instance label key
     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: |
     #   - url: git@github.com:group/repo.git
     #     sshPrivateKeySecret:
@@ -1089,11 +1089,11 @@ configs:
     #     XWyb96wrUlv+E8I=
     #     -----END CERTIFICATE-----
 ## # 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: {}
 
 ## Creates a secret for each key/value specified below to create repository credentials
-  repositoryTemplates: {}
+  credentialTemplates: {}
     # github-enterprise-creds-1:
     #   url: https://github.com/argoproj
     #   githubAppID: 1