Adding global rewrite

Signed-off-by: Markos Kandylis <markos_kandylis@hotmail.com>

Author: markoskandylis

charts/fleet-secret/templates/gitExternalSecret.yaml

@@ -1,15 +1,16 @@
 {{- if .Values.gitExternalSecrets.enabled }}
-{{- $globalGitSecrets := .Values.global.gitExternalSecrets.externalSecrets | default dict }}
-{{- $clusterGitSecrets := dict }}
-{{- if and .Values.tenantGitExternalSecrets .Values.tenantGitExternalSecrets.externalSecrets }}
-{{- $clusterGitSecrets = .Values.tenantGitExternalSecrets.externalSecrets }}
+{{- $globalGitSecrets := dict }}
+{{- if and .Values.global .Values.global.gitExternalSecrets .Values.global.gitExternalSecrets.externalSecrets }}
+{{- $globalGitSecrets = .Values.global.gitExternalSecrets.externalSecrets }}
 {{- end }}
-{{- $mergedSecrets := mergeOverwrite $globalGitSecrets $clusterGitSecrets }}
-{{- $secretStoreRefName := .Values.global.gitExternalSecrets.secretStoreRefName -}}
-{{- $secretStoreRefKind := .Values.global.gitExternalSecrets.secretStoreRefKind -}}
-{{- $useHttp := .Values.global.gitExternalSecrets.useHttp -}}
+{{- $secretStoreRefName := .Values.global.gitExternalSecrets.secretStoreRefName | default "" -}}
+{{- $secretStoreRefKind := .Values.global.gitExternalSecrets.secretStoreRefKind | default "" -}}
+{{- $useHttp := .Values.global.gitExternalSecrets.useHttp | default false -}}
 {{- $useGitHubApp := .Values.global.gitExternalSecrets.useGitHubApp | default false -}}
 {{- $usePrivateKey := .Values.global.gitExternalSecrets.usePrivateKey | default false -}}
+{{- $clusterGitSecrets := .Values.gitExternalSecrets.externalSecrets | default dict }}
+{{/*Merging Git External Secrets*/}}
+{{- $mergedSecrets := merge $clusterGitSecrets $globalGitSecrets }}
 
 {{- range $externalSecretName, $externalSecret := $mergedSecrets }}
 apiVersion: external-secrets.io/v1

charts/fleet-secret/values.yaml

@@ -1,7 +1,6 @@
 # Example of global values to append if we want to add more endpoints withough replciation
 global:
   gitExternalSecrets:
-    enabled: false
     useGitHubApp: true
     secretStoreRefName: fleet-git-eks-secret-store
     secretStoreRefKind: SecretStore
@@ -33,9 +32,6 @@ externalSecret:
   secretManagerSecretName: ""
   clusterName: ""
 
-tenantGitExternalSecrets:
-  externalSecrets: {}
-
 ecrAuthenticationToken:
   enabled: false
   name: ecr-token-secret