Merge pull request #4213 from specklesystems/iain/fileimport-service-inspect

feat(fileimport service): allows nodejs inspection to be configured

packages/fileimport-service/Dockerfile

@@ -74,4 +74,5 @@ ENV IFC_DOTNET_DLL_PATH='/speckle-server/packages/fileimport-service/src/ifc-dot
 
 WORKDIR /speckle-server/packages/fileimport-service
 
-ENTRYPOINT [ "tini", "--", "node", "--loader=./dist/src/aliasLoader.js", "bin/www.js" ]
+ENTRYPOINT [ "tini", "--", "node", "--loader=./dist/src/aliasLoader.js" ]
+CMD ["bin/www.js"]

utils/helm/speckle-server/templates/fileimport_service/deployment.yml

@@ -23,6 +23,11 @@ spec:
       - name: main
         image: {{ default (printf "speckle/speckle-fileimport-service:%s" .Values.docker_image_tag) .Values.fileimport_service.image }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
+        args: #overwrites the Dockerfile CMD statement
+        {{- if .Values.fileimport_service.inspect.enabled }}
+          - {{ printf "--inspect=%s" .Values.fileimport_service.inspect.port }}
+        {{- end }}
+          - "bin/www.js"
 
         ports:
           - name: metrics

utils/helm/speckle-server/values.schema.json

@@ -2138,6 +2138,21 @@
           "description": "The maximum number of connections that the File Import Service postgres client will make to the Postgres database.",
           "default": 1
         },
+        "inspect": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "description": "If enabled, indicates that the File Import service should be deployed with the nodejs inspect feature enabled",
+              "default": false
+            },
+            "port": {
+              "type": "string",
+              "description": "The port on which the nodejs inspect feature should be exposed",
+              "default": "7000"
+            }
+          }
+        },
         "requests": {
           "type": "object",
           "properties": {

utils/helm/speckle-server/values.yaml

@@ -1279,6 +1279,12 @@ fileimport_service:
   ##
   postgresMaxConnections: 1
 
+  inspect:
+    ## @param fileimport_service.inspect.enabled If enabled, indicates that the File Import service should be deployed with the nodejs inspect feature enabled
+    enabled: false
+    ## @param fileimport_service.inspect.port The port on which the nodejs inspect feature should be exposed
+    port: '7000'
+
   requests:
     ## @param fileimport_service.requests.cpu The CPU that should be available on a node when scheduling this pod.
     ## ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/