charts/garm/templates/_credentials.tpl

@@ -44,9 +44,10 @@ Get Gitea token - either user-provided or generated
 {{- end -}}
 
 {{- define "garm.dbPassphrase" -}}
-{{- $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-db-credentials" ( include "garm.fullname" . )) -}}
-{{- if and $secret (index $secret.data "passphrase" | b64dec) -}}
-{{- (index $secret.data "passphrase" | b64dec) -}}
+{{- $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-config" ( include "garm.fullname" . )) -}}
+{{- if and $secret ((fromToml (index $secret.data "config.toml" | b64dec)).database.passphrase) -}}
+{{- $another := fromToml (index $secret.data "config.toml" | b64dec) -}}
+{{ $another.database.passphrase }}
 {{- else -}}
 {{- include "garm.randomString" . -}}
 {{- end -}}

charts/garm/templates/secrets.yaml

@@ -14,22 +14,6 @@ stringData:
   GARM_URL: {{ printf "https://%s" (index .Values.ingress.hosts 0).host | quote }}
   GIT_URL: {{ .Values.credentials.gitea.url | quote }}
 ---
-{{- $secretName := printf "%s%s" (include "garm.fullname" .)  "-db-credentials" -}}
-{{- $secretExists := lookup "v1" "Secret" .Release.Namespace $secretName -}}
-
-{{- if not $secretExists -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ $secretName }}
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "-5"
-stringData:
-  passphrase: {{- include "garm.randomString" . -}}
-{{- end -}}
----
 apiVersion: v1
 kind: Secret
 metadata:
@@ -93,16 +77,14 @@ stringData:
       {{- toYaml .Values.providerConfig.k8s.flavors | nindent 6 }}
 
   edge-connect-provider-config.toml: |
-    log_file = "/garm/provider.log"
-    credentials_file = "/etc/garm-creds/creds.toml"
-
-    [edge_connect]
     organization = {{ .Values.providerConfig.edgeConnect.organization | quote }}
     region = {{ .Values.providerConfig.edgeConnect.region | quote }}
-    url = {{ .Values.providerConfig.edgeConnect.edgeConnectUrl | quote }}
-    default_flavor = {{ .Values.providerConfig.edgeConnect.defaultFlavor | quote }}
+    edge_connect_url = {{ .Values.providerConfig.edgeConnect.edgeConnectUrl | quote }}
+    log_file = "/garm/provider.log"
+    credentials_file = "/etc/garm-creds/creds.toml"
+    default_flavor = "EU.small"
 
-    [edge_connect.cloudlet]
+    [cloudlet]
     name = {{ .Values.providerConfig.edgeConnect.cloudlet.name | quote }}
     organization = {{ .Values.providerConfig.edgeConnect.cloudlet.organization | quote }}
 {{- if not .Values.credentials.edgeConnect.existingSecretName }}

charts/garm/values.yaml

@@ -4,7 +4,7 @@ fullnameOverride: ""
 
 image:
   repository: edp.buildth.ing/devfw-cicd/garm
-  tag: provider-ec-43
+  tag: provider-ec-40
   pullPolicy: Always
 
 replicaCount: 1
@@ -103,7 +103,6 @@ providerConfig:
     organization: "edp-developer-framework"
     region: "EU"
     edgeConnectUrl: "https://hub.apps.edge.platform.mg3.mdb.osc.live"
-    defaultFlavor: "EU.small"
     cloudlet:
       name: "Munich"
       organization: "TelekomOP"