update env variables handling

Author: eloiferrer

charts/importer/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 name: importer
 description: A Helm chart for the MaRDI importer utilities
-version: 0.1.25
+version: 0.1.26
 appVersion: "1.0.0"

charts/importer/secret-example.yaml

@@ -9,7 +9,5 @@ metadata:
 type: Opaque
 data:
   IMPORTER_MW_AGENT: <base64-encoded-mediawiki-importer-agent>
-  IMPORTER_MW_USER: <base64-encoded-mediawiki-importer-user>
-  IMPORTER_MW_PASS: <base64-encoded-mediawiki-importer-pass>
-  IMPORTER_DB_PASSWORD: <base64-encoded-importer-db-password>
+  IMPORTER_DB_PASS: <base64-encoded-importer-db-password>
   PREFECT_API_AUTH_STRING: <base64-encoded-prefect-api-auth>

charts/importer/templates/configmap.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-config
+  labels:
+    app: {{ .Release.Name }}
+data:
+  DB_HOST: {{ .Values.database.host | quote }}
+  DB_NAME: {{ .Values.database.name | quote }}
+  IMPORTER_DB_USER: {{ .Values.database.user | quote }}
+  SPARQL_ENDPOINT_URL: {{ .Values.endpoints.sparql | quote }}
+  MEDIAWIKI_API_URL: {{ .Values.endpoints.mediawiki | quote }}
+  WIKIBASE_URL: {{ .Values.endpoints.wikibase | quote }}
+  WIKIBASE_SCHEME: {{ .Values.endpoints.wikibase_scheme | quote }}
+  WIKIBASE_HOST: {{ .Values.global.baseDomain | quote }}
+  IMPORTER_API_URL: {{ .Values.endpoints.importerApi | quote }}
+  PREFECT_API_URL: {{ .Values.prefect.endpoint | quote }}
+  DEPLOYMENT_NAME: {{ .Values.prefect.deployment | quote }}

charts/importer/templates/deployment.yaml

@@ -21,52 +21,10 @@ spec:
         envFrom:
         - secretRef:
             name: {{ .Release.Name }}-accounts
-        env:
-        - name: DB_HOST
-          value: {{ .Values.database.host }}
-        - name: DB_NAME
-          value: {{ .Values.database.name }}
-        - name: DB_USER
-          value: {{ .Values.database.user }}
-        - name: DB_PASS
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-secrets
-              key: IMPORTER_DB_PASSWORD
-        - name: IMPORTER_AGENT
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-secrets
-              key: IMPORTER_MW_AGENT
-        - name: IMPORTER_USER
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-secrets
-              key: IMPORTER_MW_USER
-        - name: IMPORTER_PASS
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-secrets
-              key: IMPORTER_MW_PASS
-        - name: PREFECT_API_AUTH_STRING
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-secrets
-              key: PREFECT_API_AUTH_STRING
-        - name: SPARQL_ENDPOINT_URL
-          value: {{ .Values.endpoints.sparql }}
-        - name: MEDIAWIKI_API_URL
-          value: {{ .Values.endpoints.mediawiki }}
-        - name: WIKIBASE_URL
-          value: {{ .Values.endpoints.wikibase }}
-        - name: WIKIBASE_SCHEME
-          value: {{ .Values.endpoints.wikibase_scheme }}
-        - name: WIKIBASE_HOST
-          value: {{ .Values.global.baseDomain }}
-        - name: IMPORTER_API_URL
-          value: {{ .Values.endpoints.importerApi }}
-        - name: PREFECT_API_URL
-          value: {{ .Values.endpoints.prefect}}
+        - secretRef:
+            name: {{ .Release.Name }}-secrets
+        - configMapRef:
+            name: {{ .Release.Name }}-config
         resources:
           requests:
             memory: {{ .Values.importer.resources.requests.memory }}

charts/importer/values.yaml

@@ -55,8 +55,11 @@ endpoints:
   wikibase: "mardi-wikibase"
   sparql: "mardi-wikibase/sparql"
   importerApi: "importer-api"
-  prefect: "http://prefect-server:4200/api"
   wikibase_scheme: "https"
 
 ingress:
-  subdomain: "importer"
+  subdomain: "importer"
+
+prefect:
+  endpoint: "http://prefect-server:4200/api"
+  deployment: "mardi-importer/prefect-mardi-importer"