Update config toml to new format, parameterise defaultFlavor

charts/garm/edge-connect-provider-config.toml

@@ -1,10 +0,0 @@
-    organization = {{ .Values.providerConfig.edgeConnect.organization | quote }}
-    region = {{ .Values.providerConfig.edgeConnect.region | 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"
-
-    [cloudlet]
-    name = {{ .Values.providerConfig.edgeConnect.cloudlet.name | quote }}
-    organization = {{ .Values.providerConfig.edgeConnect.cloudlet.organization | quote }}

charts/garm/templates/secrets.yaml

@@ -76,7 +76,19 @@ stringData:
     flavors:
       {{- toYaml .Values.providerConfig.k8s.flavors | nindent 6 }}
 
-  edge-connect-provider-config.toml: {{ tpl (.Files.Get "../edge-connect-provider-config.toml") . | b64enc }}
+  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.cloudlet]
+    name = {{ .Values.providerConfig.edgeConnect.cloudlet.name | quote }}
+    organization = {{ .Values.providerConfig.edgeConnect.cloudlet.organization | quote }}
 {{- if not .Values.credentials.edgeConnect.existingSecretName }}
 ---
 apiVersion: v1

charts/garm/values.yaml

@@ -103,6 +103,7 @@ 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"