fix: gitops SCM authentication

This was broken with 44728b5

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

installer/charts/rhtap-gitops/templates/NOTES.txt

@@ -5,6 +5,6 @@ ArgoCD:
     Namespace: {{ $argoCD.namespace }}
     Server URL: https://{{ include "argoCD.serverHostname" . }}
     Admin Secret: {{ include "argoCD.secretClusterName" . }}
-    Integration Secret: {{ $argoCD.secretName }}
+    Integration Secret: {{ $argoCD.integrationSecret.name }}
 
 {{ end -}}

installer/charts/rhtap-gitops/values.yaml

@@ -12,6 +12,7 @@ argoCD:
   # The secret namespace to store the ArgoCD API credentials, this secret is later on
   # used for integration with other services.
   integrationSecret:
+    name: __OVERWRITE_ME__
     namespace: __OVERWRITE_ME__
   # Route configuration for all ArgoCD components.
   route:

installer/charts/rhtap-integrations/templates/gitops/bitbucket-auth.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.argoCD.enabled -}}
+  {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace "rhtap-bitbucket-integration") -}}
+  {{- $secretData := (get $secretObj "data") | default dict -}}
+  {{- if $secretData -}}
+apiVersion: v1
+data:
+  password: {{ $secretData.appPassword }}
+  username: {{ $secretData.username }}
+kind: Secret
+metadata:
+  labels:
+    argocd.argoproj.io/secret-type: repo-creds
+  name: bitbucket-auth-secret
+  namespace: {{ .Values.argoCD.namespace }}
+stringData:
+  type: git
+  url: https://{{ $secretData.host | b64dec }}
+type: Opaque
+  {{- end -}}
+{{- end -}}

installer/charts/rhtap-integrations/templates/gitops/github-auth.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.argoCD.enabled -}}
+  {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace "rhtap-github-integration") -}}
+  {{- $secretData := (get $secretObj "data") | default dict -}}
+  {{- if $secretData -}}
+apiVersion: v1
+data:
+  password: {{ $secretData.token }}
+kind: Secret
+metadata:
+  labels:
+    argocd.argoproj.io/secret-type: repo-creds
+  name: github-auth-secret
+  namespace: {{ .Values.argoCD.namespace }}
+stringData:
+  type: git
+  url: https://{{ $secretData.host | b64dec }}
+  username: "oauth2"
+type: Opaque
+  {{- end -}}
+{{- end -}}

installer/charts/rhtap-integrations/templates/gitops/gitlab-auth.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.argoCD.enabled -}}
+  {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace "rhtap-gitlab-integration") -}}
+  {{- $secretData := (get $secretObj "data") | default dict -}}
+  {{- if $secretData -}}
+apiVersion: v1
+data:
+  password: {{ $secretData.token }}
+kind: Secret
+metadata:
+  labels:
+    argocd.argoproj.io/secret-type: repo-creds
+  name: gitlab-auth-secret
+  namespace: {{ .Values.argoCD.namespace }}
+stringData:
+  type: git
+  url: https://{{ $secretData.host | b64dec }}
+  username: "oauth2"
+type: Opaque
+  {{- end -}}
+{{- end -}}

installer/charts/rhtap-integrations/values.yaml

@@ -1,6 +1,9 @@
 ---
 integrations:
   acs:
-    enabled: true
+    enabled: __OVERWRITE_ME__
+  argoCD:
+    enabled: __OVERWRITE_ME__
+    namespace: __OVERWRITE_ME__
   quay:
-    enabled: true
+    enabled: __OVERWRITE_ME__

installer/charts/values.yaml.tpl

@@ -263,6 +263,9 @@ quay:
 integrations:
   acs:
     enabled: {{ $acs.Enabled }}
+  argoCD:
+    enabled: {{ $gitops.enabled }}
+    namespace: {{ $gitops.Namespace }}
   quay:
     enabled: {{ $quay.Enabled }}
 #   github: