Merge remote-tracking branch 'origin/adam/ifc-dotnet' into adam/ifc-d…

…otnet
specklesystems · Nov 28, 2024 · 2c29cf5 · 2c29cf5
2 parents e2ddcf4 + a3349c5
commit 2c29cf5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/shared/src/environment/index.ts b/packages/shared/src/environment/index.ts
@@ -50,6 +50,11 @@ const parseFeatureFlags = () => {
     FF_WORKSPACES_MULTI_REGION_ENABLED: {
       schema: z.boolean(),
       defaults: { production: false, _: false }
+    },
+    // Toggles IFC parsing with experimental .Net parser
+    FF_FILEIMPORT_IFC_DOTNET_ENABLED: {
+      schema: z.boolean(),
+      defaults: { production: false, _: false }
     }
   })
 
@@ -74,6 +79,7 @@ export function getFeatureFlags(): {
   FF_GATEKEEPER_MODULE_ENABLED: boolean
   FF_BILLING_INTEGRATION_ENABLED: boolean
   FF_WORKSPACES_MULTI_REGION_ENABLED: boolean
+  FF_FILEIMPORT_IFC_DOTNET_ENABLED: boolean
 } {
   if (!parsedFlags) parsedFlags = parseFeatureFlags()
   return parsedFlags

diff --git a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml
@@ -34,7 +34,7 @@ spec:
           periodSeconds: 60
           exec:
             command:
-              - /nodejs/bin/node
+              - /usr/bin/node
               - -e
               - process.exit(Date.now() - require('fs').readFileSync('/tmp/last_successful_query', 'utf8') > 25 * 60 * 1000)
 
@@ -59,6 +59,8 @@ spec:
         volumeMounts:
           - mountPath: /tmp
             name: tmp
+          - mountPath: /.config
+            name: dotconfig
         {{- if .Values.db.useCertificate }}
           - name: postgres-certificate
             mountPath: /postgres-certificate
@@ -97,11 +99,13 @@ spec:
           {{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
           - name: FF_WORKSPACES_MULTI_REGION_ENABLED
             value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }}
-          - name: FF_FILEIMPORT_IFC_DOTNET_ENABLED
-            value: {{ .Values.featureFlags.fileImportIFCDotNetEnabled | quote }}
           - name: MULTI_REGION_CONFIG_PATH
             value: "/multi-region-config/multi-region-config.json"
           {{- end }}
+          {{- if .Values.featureFlags.fileImportIFCDotNetEnabled }}
+          - name: FF_FILEIMPORT_IFC_DOTNET_ENABLED
+            value: {{ .Values.featureFlags.fileImportIFCDotNetEnabled | quote }}
+          {{- end }}
       {{- if .Values.fileimport_service.affinity }}
       affinity: {{- include "speckle.renderTpl" (dict "value" .Values.fileimport_service.affinity "context" $) | nindent 8 }}
       {{- end }}
@@ -132,6 +136,8 @@ spec:
       volumes:
         - name: tmp
           emptyDir: {}
+        - name: dotconfig
+          emptyDir: {}
       {{- if .Values.db.useCertificate }}
         - name: postgres-certificate
           configMap: