Skip to content

Commit 7da039d

Browse files
fix: duplicate credentials warning in Argocd (#2796)
Co-authored-by: svcAPLBot <174728082+svcAPLBot@users.noreply.github.com>
1 parent dec62d1 commit 7da039d

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

charts/team-ns/templates/argocd/argocd-repo-secret.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

values/argocd/argocd-raw.gotmpl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{- $v := .Values }}
22
{{- $a := $v.apps.argocd }}
3+
{{- $g := $v.apps.gitea }}
34
resources:
45
{{- if $v._derived.untrustedCA }}
56
- apiVersion: v1
@@ -9,3 +10,15 @@ resources:
910
data:
1011
custom-ca-certificates.crt: {{ .Values._derived.caCert | b64enc }}
1112
{{- end }}
13+
- apiVersion: v1
14+
kind: Secret
15+
metadata:
16+
name: argocd-repo-creds-gitea
17+
namespace: argocd
18+
labels:
19+
argocd.argoproj.io/secret-type: repo-creds
20+
data:
21+
type: {{ print "git" | b64enc | quote }}
22+
url: {{ printf "https://%s" $v._derived.giteaDomain | b64enc }}
23+
username: {{ $g.adminUsername | b64enc }}
24+
password: {{ $g.adminPassword | b64enc }}

values/team-ns/team-ns.gotmpl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ defaultIngressGatewayLabel: {{ $v._derived.defaultIngressGatewayLabel }}
6666
canaryIngressGatewayLabel: {{ $v._derived.canaryIngressGatewayLabel | quote }}
6767

6868
gitOps:
69-
adminPassword: {{ $a.gitea.adminPassword | quote }}
70-
adminUsername: {{ $a.gitea.adminUsername }}
71-
globalUrl: "https://{{ $v._derived.giteaDomain }}"
7269
teamRepoUrl: "https://{{ $v._derived.giteaDomain }}/otomi/team-{{ $teamId }}-argocd.git"
7370
valuesRepoUrl: "https://{{ $v._derived.giteaDomain }}/otomi/values.git"
7471
workloadValuesRepoUrl: "https://{{ $v._derived.giteaDomain }}/otomi/values.git"

0 commit comments

Comments
 (0)