fix(helm): move scripts into initdb as .sql files

Signed-off-by: WoodenMaiden <[email protected]>
SouthGreenPlatform · Aug 30, 2024 · 4ff022f · 4ff022f
1 parent bc0f7c5
commit 4ff022f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 248 deletions.
diff --git a/agrold-javaweb/charts/virtuoso/templates/config.yaml b/agrold-javaweb/charts/virtuoso/templates/config.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.iniFileValues.enabled -}}
+{{- $enable := or .Values.iniFileValues.enabled .Values.facetedSearch.enabled (not.Values.serveConductor) -}}
+{{- if $enable -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -9,4 +10,17 @@ data:
     {{ join "." (list $section $key) | quote }}: {{ $value | quote }}
     {{- end }}
   {{- end }}
+
+  {{- if not .Values.serveConductor }}
+    "99999999999999999_disable_conductor.sql": |-
+      vad_uninstall('conductor/1.00.8852');
+  {{- end }}
+
+  {{- if .Values.facetedSearch.enabled }}
+    "99999999999999999_enable_faceted.sql": |-
+      vad_install('/opt/virtuoso-opensource/vad/fct_dav.vad', 0);
+      {{- if .Values.facetedSearch.enableLabels }}
+      registry_set('fct_desc_value_labels', '1');
+      {{- end }}
+  {{- end }}
 {{- end }}
diff --git a/agrold-javaweb/charts/virtuoso/templates/scripts.yaml b/agrold-javaweb/charts/virtuoso/templates/scripts.yaml
diff --git a/agrold-javaweb/charts/virtuoso/templates/statefulset.yaml b/agrold-javaweb/charts/virtuoso/templates/statefulset.yaml
@@ -45,29 +45,6 @@ spec:
             name: {{ include "sparql.scripts.configMapName" . }}
         {{- end }}
       containers:
-        {{- if or (not .Values.serveConductor) .Values.facetedSearch.enabled }}
-        # Turns out we cannot do this in the /initdb.d because 
-        # it blocks connections to the 1111 port
-        - name: disable-conductor
-          image: openlink/virtuoso-opensource-7
-          tag: 7.2.11
-          volumeMounts:
-            - name: disableconductor
-              mountPath: /mnt
-          restartPolicy: OnFailure
-          command: 
-            - /bin/sh
-            - "-c"
-            - /mnt/..data/wait-for-it.sh localhost:1111 -t 0 -- /mnt/..data/run_scripts.sh
-          env:
-            - name: "DBA_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "sparql.secretName" . }}
-                  key: DBAPassword
-
-        {{- end }}
-
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}