Merge branch '16-incorrect-git-credentials-values-in-generated-helper' into 'master'

Resolve "incorrect git credentials values in generated helper"

Closes #16

See merge request platform-one/big-bang/bigbang!235

chart/templates/_helpers.tpl

@@ -52,13 +52,13 @@ branch: {{ .branch | quote }}
 Build the appropriate git credentials secret for private git repositories
 */}}
 {{- define "gitCreds" -}}
-{{- if .existingSecret -}}
+{{- if .Values.git.existingSecret -}}
 secretRef:
-  name: {{ .existingSecret }}
-{{- else if coalesce .credentials.username .credentials.password .credentials.privateKey .credentials.publicKey .credentials.knownHosts "" -}}
+  name: {{ .Values.git.existingSecret }}
+{{- else if coalesce .Values.git.credentials.username .Values.git.credentials.password .Values.git.credentials.privateKey .Values.git.credentials.publicKey .Values.git.credentials.knownHosts "" -}}
 {{- /* Input validation happens in git-credentials.yaml template */ -}}
 secretRef:
-  name: git-credentials
+  name: {{ $.Release.Name }}-git-credentials
 {{- end -}}
 {{- end -}}
 

chart/templates/anchore/gitrepository.yaml

@@ -10,5 +10,5 @@ spec:
   ref:
     {{- include "validRef" .Values.addons.anchore.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/argocd/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.addons.argocd.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/authservice/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.addons.authservice.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/clusterauditor/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.clusterAuditor.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/gatekeeper/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.gatekeeper.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/gitlab-runner/gitrepository.yaml

@@ -10,5 +10,5 @@ spec:
   ref:
     {{- include "validRef" .Values.addons.gitlabRunner.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}
\ No newline at end of file

chart/templates/gitlab/gitrepository.yaml

@@ -13,5 +13,5 @@ spec:
   url: {{ .Values.addons.gitlab.git.repo }}
   ref:
     {{- include "validRef" .Values.addons.gitlab.git | nindent 4 }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/haproxy/gitrepository.yaml

@@ -9,4 +9,4 @@ spec:
   ref:
     {{- include "validRef" .Values.addons.haproxy.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
\ No newline at end of file
+  {{- include "gitCreds" . | nindent 2 }}
\ No newline at end of file

chart/templates/istio/controlplane/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.istio.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}
\ No newline at end of file

chart/templates/istio/operator/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.istiooperator.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/logging/eck-operator/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.eckoperator.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/logging/elasticsearch-kibana/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.logging.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/logging/fluentbit/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.fluentbit.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/minio/minio-instance/gitrepository.yaml

@@ -10,5 +10,5 @@ spec:
   ref:
     {{- include "validRef" .Values.minio.minioinstance.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/minio/minio-operator/gitrepository.yaml

@@ -10,5 +10,5 @@ spec:
   ref:
     {{- include "validRef" .Values.minio.miniooperator.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/monitoring/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.monitoring.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/sonarqube/gitrepository.yaml

@@ -10,5 +10,5 @@ spec:
   ref:
     {{- include "validRef" .Values.addons.sonarqube.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/twistlock/gitrepository.yaml

@@ -14,5 +14,5 @@ spec:
   ref:
     {{- include "validRef" .Values.twistlock.git | nindent 4 }}
   {{ include "gitIgnore" . }}
-  {{- include "gitCreds" .Values.git | nindent 2 }}
+  {{- include "gitCreds" . | nindent 2 }}
 {{- end }}