feat(helm chart): optionally deploy ifc importer service (#5077)

tests/deployment/docker-compose/Tiltfile

@@ -7,17 +7,20 @@ if IS_LOAD_DOCKER:
 else:
   symbols = load_dynamic('./../build-images.tiltfile')
 
+IMAGE_PREFIX = os.getenv('IMAGE_PREFIX', 'speckle')
+
 # Prepare the Speckle images
 # (loads the images from tgz file if CI, otherwise builds them or pulls them from remote as a fallback on non-amd64 machines)
 speckle_image = symbols['speckle_image']
-speckle_image('fileimport-service')
-speckle_image('frontend-2')
-speckle_image('docker-compose-ingress')
-# speckle_image('monitor-deployment')
-speckle_image('preview-service')
-speckle_image('server')
-speckle_image('test-deployment')
-speckle_image('webhook-service')
+speckle_image('fileimport-service', None, IMAGE_PREFIX)
+speckle_image('frontend-2', None, IMAGE_PREFIX)
+speckle_image('ifc-import-service', None, IMAGE_PREFIX)
+speckle_image('docker-compose-ingress', None, IMAGE_PREFIX)
+# speckle_image('monitor-deployment', None, IMAGE_PREFIX)
+speckle_image('preview-service', None, IMAGE_PREFIX)
+speckle_image('server', None, IMAGE_PREFIX)
+speckle_image('test-deployment', None, IMAGE_PREFIX)
+speckle_image('webhook-service', None, IMAGE_PREFIX)
 
 # Prepare the dependencies
 docker_compose('../../docker-compose-deps.yml')
@@ -34,6 +37,7 @@ dc_resource('speckle-frontend-2', resource_deps=[], labels=['speckle'])
 dc_resource('speckle-ingress', resource_deps=[], labels=['speckle'])
 dc_resource('preview-service', resource_deps=['postgres'], labels=['speckle'])
 dc_resource('fileimport-service', resource_deps=[], labels=['speckle'])
+dc_resource('ifc-import-service', resource_deps=[], labels=['speckle'])
 dc_resource('webhook-service', resource_deps=['postgres'], labels=['speckle'])
 
 # Test the Speckle resources

tests/deployment/helm/Tiltfile

@@ -23,6 +23,7 @@ IMAGE_PREFIX = os.getenv('IMAGE_PREFIX', 'speckle')
 speckle_image = symbols['speckle_image']
 speckle_image('fileimport-service', None, IMAGE_PREFIX)
 speckle_image('frontend-2', None, IMAGE_PREFIX)
+speckle_image('ifc-import-service', None, IMAGE_PREFIX)
 speckle_image('monitor-deployment', None, IMAGE_PREFIX)
 speckle_image('preview-service', None, IMAGE_PREFIX)
 speckle_image('server', None, IMAGE_PREFIX)
@@ -126,6 +127,7 @@ helm_resource('speckle-server',
               image_deps=[
                           'speckle/speckle-fileimport-service',
                           'speckle/speckle-frontend-2',
+                          'speckle/speckle-ifc-import-service',
                           'speckle/speckle-monitor-deployment',
                           'speckle/speckle-preview-service',
                           'speckle/speckle-server',
@@ -136,6 +138,7 @@ helm_resource('speckle-server',
               image_keys=[
                           'fileimport_service.image',
                           'frontend_2.image',
+                          'ifc_import_service.image',
                           'monitor.image',
                           'preview_service.image',
                           'server.image',

tests/deployment/helm/manifests/speckle-server.secret.yaml

@@ -4,6 +4,7 @@ data:
   session_secret: 'c3BvcmtsZXNzcHJlY2tsZXNzcGVrbGU='
   redis_url: 'cmVkaXM6Ly86dmFsa2V5QHZhbGtleS1wcmltYXJ5LnZhbGtleS5zdmMuY2x1c3Rlci5sb2NhbDo2Mzc5Cg=='
   postgres_url: 'cG9zdGdyZXNxbDovL3NwZWNrbGU6c3BlY2tsZUBwb3N0Z3Jlc3FsLnBvc3RncmVzLnN2Yy5jbHVzdGVyLmxvY2FsOjU0MzIvc3BlY2tsZQo='
+  fileimport_queue_postgres_url: 'cG9zdGdyZXNxbDovL3NwZWNrbGU6c3BlY2tsZUBwb3N0Z3Jlc3FsLnBvc3RncmVzLnN2Yy5jbHVzdGVyLmxvY2FsOjU0MzIvc3BlY2tsZQo='
 kind: Secret
 metadata:
   name: server-vars

tests/deployment/helm/values/speckle-server.values.yaml

@@ -19,7 +19,7 @@ server:
   email:
     enabled: false
 
-  speckleAutomateUrl: http://automate.speckle.internal # value is overridden when deployed with by ./scripts/local_deployment.sh
+  speckleAutomateUrl: http://automate.speckle.internal
   monitoring:
     mp:
       enabled: false
@@ -60,11 +60,17 @@ fileimport_service:
   replicas: 0
   logPretty: true
 
+ifc_import_service:
+  enabled: false
+  replicas: 1
+  logPretty: true
+
 monitoring:
   replicas: 0
   logPretty: true
 
 s3:
+  publicEndpoint: 'http://speckle.internal:9002'
   endpoint: 'http://minio.minio.svc.cluster.local:9000'
   bucket: 'speckle-server'
   access_key: minioadmin