release: 3.5.0

INSTALL_K8S.rst

@@ -7,7 +7,7 @@ instant3Dhub on Kubernetes
 Read First
 ********************************************
 Kubernetes is the targeted platform for running instant3Dhub. Therefore, this guide assumes a k8s cluster exists and can be accessed for deployments.
-Details about the requirements for running instant3Dhub can be found `here </INSTALL_REQUIREMENTS.rst>`_  
+Details about the requirements for running instant3Dhub can be found `here <./INSTALL_REQUIREMENTS.rst>`_  
 Instant3Dhub is shipped with all the necessery components and services to run completely in kubernetes without the need to setup external services. However not all services.
 However it is possible to use exernal services like PostgreSQL, ELK stack and RabbitMQ. Setting up these external services is recommend in some scenarios and specially in production environments.
 More information on how to configure Instant3Dhub to run with external services can be found below.

LICENSE_SERVER.rst

@@ -8,9 +8,13 @@ Read First
 
 The instant3Dhub License Server needs to be accessible by the servers 
 instant3Dhub is running on. The license server cannot be run in container
-environments as it is bound to a host machine. Although this might look similar 
-to the external PostgreSQL install, it uses a different set of Ansible 
-playbooks. 
+environments as it is bound to a host machine. There are two options for storing 
+data (recommended to use PostgreSQL 14):
+
+* :ref:`PostgreSQL on the same server<Fresh Installation with Ansible and Local PostgreSQL>`
+* :ref:`PostgreSQL managed remotely<Fresh Installation with Remote PostgreSQL>` 
+
+We recommend an externally managed PostgreSQL in order to avoid data loss.
 
 .. warning:: 
   If upgrading the license server from version 21.4, see the upgrading section 
@@ -40,7 +44,7 @@ and the ansible roles to install and initialize the database:
 
 The latest installation files and a changelog can be found `here <https://repo.threedy.io/licenseserver/>`_
 
-Fresh Installation with Ansible
+Fresh Installation with Ansible and Local PostgreSQL
 ================================================================================
 
 We assume that no instant3Dhub version 2 PostgreSQL installation is running on
@@ -105,9 +109,25 @@ Invoke the following playbooks:
   ansible-playbook -i hosts.yml ./ansible/PostgreSQL/pgsql.licensedb.install.yml
   ansible-playbook -i hosts.yml ./ansible/PostgreSQL/pgsql.licensedb.init.yml
 
-
 This installs and initializes a PostgreSQL instance. 
 
+Fresh Installation with Remote PostgreSQL
+================================================================================
+
+:ref:`Install<Install License Server>` the correct RPM for your distribution 
+from `here <https://repo.threedy.io/licenseserver/>`_.
+
+You will need to :ref:`configure<License Server Configuration>` the license 
+server to use PostgreSQL the remote instance by providing a connection string.
+The license server will setup or migrate required tables on startup. To start 
+the server, make sure to use the systemd unit file which does not depend on a 
+local postgres instance:
+
+.. code-block:: bash
+
+  systemctl start instant3DhubLicenseServerRemoteDB.service 
+  systemctl status instant3DhubLicenseServerRemoteDB.service 
+
 Install License Server
 ================================================================================
 
@@ -148,8 +168,8 @@ Restart the License Server:
 
 .. code-block:: bash
 
-  systemctl restart instant3DhubLicenseServer.service 
-  systemctl status instant3DhubLicenseServer.service 
+  systemctl restart instant3DhubLicenseServer{RemoteDB}.service 
+  systemctl status instant3DhubLicenseServer{RemoteDB}.service 
 
 The status should now show be active.
 
@@ -159,6 +179,48 @@ local PostgreSQL instance.
 An address to this License Server must be placed inside the setup file of your 
 instant3Dhub deployment. 
 
+********************************************************************************
+License Server Configuration
+********************************************************************************
+
+Configuration can be provided by creating a configuration file at the 
+``/opt/instant3Dhub.custom/license_config.yml``. Below is a sample file with 
+available options and their defaults. If no file exists, the defaults seen below
+will be used.
+
+.. code-block:: yaml
+
+  # interface and port to listen on
+  address: 0.0.0.0:8200
+
+  # log level to use. options: fatal panic error warning info debug trace
+  log-level: info
+
+  # location of the license file
+  licenseFile: /opt/instant3Dhub.custom/license.xml
+
+  # location of tls certificate
+  tls-cert:
+
+  # location of tls private key
+  tls-key:
+
+  # postgres backend options
+  postgres:
+    # connection string describing the postgres location and user. the given
+    # user must have permissions to create schemas, tables and stored procedures.
+    # expected format is the URI format described here: https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
+    connection-string: postgresql://i3dhub:12and3@localhost:5433/instantLicense?sslmode=disable
+
+    # user to use once migrations are complete. this user also receives table write permissions during migrations
+    # by default the user from the connection string is also used during runtime.
+    runtime-user:
+
+    # password for the runtime user to allow switching to this user once migrations are complete
+    # this value must be given if a runtime user is also provided
+    runtime-password:
+
+
 ********************************************************************************
 License Server Upgrades
 ********************************************************************************
@@ -379,22 +441,6 @@ PostgreSQL installation:
   ./delete_old_cluster.sh
   sudo yum remove -y postgresql postgresql-server postgresql-contrib postgresql-libs
 
-********************************************************************************
-License Server Usage Export 
-********************************************************************************
-
-For license fee calculation the license server records usage statistics. 
-The license server provides an interface to view and export this usage. 
 
-If the license server endpoint is opened via browser an easy to understand UI can be used to export and view the usage.
-
-For functional operation the license server endpoint only needs to be exposed to the pods of instant3Dhub. 
-However network access to the license server must be opened in order for administration to get the usage export. 
-
-Alternatively the license server endpoint can be accessed via curl. Please attach the header ``Accept: text/csv`` to export as csv. 
-
-.. code-block:: bash 
-  
-  curl 'http://your.license.server:8200/usage/export' -H 'Accept: text/csv' > export.csv
 
 

LICENSE_SERVER_USAGE.rst

+********************************************************************************
+License Server Usage Export 
+********************************************************************************
+
+For license fee calculation the license server records usage statistics. 
+The license server provides an interface to view and export this usage. 
+
+If the license server endpoint is opened via browser an easy to understand UI 
+can be used to export and view the usage.
+
+For functional operation the license server endpoint only needs to be exposed to 
+the pods of instant3Dhub. However network access to the license server must be 
+opened in order for administration to get the usage export. 
+
+Alternatively the license server endpoint can be accessed via curl:
+
+.. code-block:: bash 
+  
+  curl 'http://your.license.server:8200/usage/export' > export.zip
+
+
+To export the usage for a specific time interval, define ``start`` and ``end`` as unix timestamps.
+
+For example, the usage between 01.07.2022 and 31.07.2022 can be exported with the following timestamps:
+``start=1656626400`` and ``end=1659218400``
+
+
+.. code-block:: bash
+
+  curl "http://your.license.server:8200/usage/export?start=1656626400&end=1659218400
\ No newline at end of file

helm/templates/_helpers.tpl

@@ -57,3 +57,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- define "i3dhub.config.generators" -}}
 /i3dhub-config/generators/
 {{- end -}}
+
+{{- define "i3dhub.db.version.store" -}}
+store:2
+{{- end -}}

helm/templates/adminsvc.yml

@@ -42,8 +42,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -79,8 +79,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -93,9 +93,15 @@ spec:
                   name: {{ .Values.credentials.admin.secretKeyRef.name }}
                   key: {{ .Values.credentials.admin.secretKeyRef.key }}
 {{- end }}
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
           volumeMounts:
             - name: i3dhub-cache-storage

helm/templates/apigw.yml

@@ -45,8 +45,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -88,8 +88,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
           volumeMounts:
             - name: local-nginx-config
               mountPath: "/opt/nginx.custom/"
@@ -128,16 +128,22 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
                   key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
           volumeMounts:
             - name: local-i3dhub-log

helm/templates/configs.yml

@@ -8,7 +8,7 @@ TODO: Find an automated way to list these with helm, .Files does not
       work as we cannot access files in the templates/ folder. We need these to 
       be templated though as helm needs to be able modify them. 
 */}}
-{{ $services := tuple "AdminService.yml" "APIGateway.yml" "AuthService.yml" "BaseConfig.yml" "DeliveryService.yml" "EntryGateway.yml" "GeometricService.yml" "KeyStore.yml" "MeasurementService.yml" "QueryService.yml" "ResourceGateway.yml" "SharedSessionService.yml" "SpaceService.yml" "SpaceStore.yml" "SpaceStoreService.yml" "TrackerService.yml" "TranscoderService.yml" "UploadService.yml" "VisService.yml" }}
+{{ $services := tuple "AdminService.yml" "APIGateway.yml" "AuthService.yml" "BaseConfig.yml" "DeliveryService.yml" "EntryGateway.yml" "GeometricService.yml" "KeyStore.yml" "MeasurementService.yml" "QueryService.yml" "ResourceGateway.yml" "SharedSessionService.yml" "SpaceService.yml" "SpaceStore.yml" "SpaceStoreService.yml" "TrackerService.yml" "TranscoderService.yml" "UploadService.yml" "VisService.yml" "MigrateDatabases.yml" }}
 {{- $scope := . -}}
 {{- range $_, $t := $services }}
 {{- with $scope }}

helm/templates/consul.yml

@@ -50,9 +50,9 @@ spec:
             - name: CONSUL_PORT
               value: "8500"
             - name: CONSUL_CONTENT_PATH
-              value: {{ include "i3dhub.proxyPath" . }}/consul/ui/
+              value: {{ include "i3dhub.proxyPath" . }}/admin/consul/ui/
             - name: CONSUL_PROXY_PATH
-              value: {{ include "i3dhub.proxyPath" . }}/consul
+              value: {{ include "i3dhub.proxyPath" . }}/admin/consul
           volumeMounts:
             - name: local-data-volume
               mountPath: "/consul/data/"

helm/templates/delivery.yml

@@ -45,8 +45,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -83,9 +83,15 @@ spec:
               value: i3dhub-consul:8500
             - name: JAEGER_COLLECTOR_HOSTS
               value: i3dhub-jaeger-collector:14250
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
           volumeMounts:
             - mountPath: /var/cache/instant3Dhub/
@@ -126,16 +132,22 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
                   key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
           volumeMounts:
             - mountPath: /var/cache/instant3Dhub/

helm/templates/elk.yml

+{{- if .Values.tracing.withJaeger }}
 # ELASTIC BEGIN
-{{- if .Values.elasticStackFeatures.enabled }}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -128,7 +128,7 @@ spec:
             - name: ELASTICSEARCH_HOSTS
               value: http://i3dhub-elastic:9200
             - name: SERVER_BASEPATH
-              value: {{ include "i3dhub.proxyPath" . }}/kibana
+              value: {{ include "i3dhub.proxyPath" . }}/admin/kibana
 
 
 ---

helm/templates/entrygw.yml

@@ -75,9 +75,15 @@ spec:
               value: i3dhub-elastic:9200
             - name: I3DH_CONSUL_HOST
               value: i3dhub-consul:8500
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
           volumeMounts:
             - mountPath: /opt/instant3Dhub/share/instant3Dhub/services/hubgw/

helm/templates/geometric.yml

@@ -48,8 +48,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -89,16 +89,22 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
                   key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
           volumeMounts:
             - mountPath: /var/cache/instant3Dhub/

helm/templates/jaeger.yml

-{{- if .Values.elasticStackFeatures.enabled }}
+{{- if .Values.tracing.withJaeger }}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -123,7 +123,7 @@ spec:
               value: http://i3dhub-elastic:9200
 
             - name: QUERY_BASE_PATH
-              value:  {{ include "i3dhub.proxyPath" . }}/jaeger
+              value:  {{ include "i3dhub.proxyPath" . }}/admin/jaeger
 ---
 
 apiVersion: v1

helm/templates/keystore.yml

@@ -42,8 +42,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -79,16 +79,22 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
                   key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
           volumeMounts:
             - name: local-i3dhub-log

helm/templates/measurement.yml

@@ -46,8 +46,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -74,16 +74,22 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
                   key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
 {{- if not .Values.resourceLimits.ignore }}
           resources:

helm/templates/migrate.yml

+{{- if .Values.migration.spaces.enabled }}
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: i3dhub-migrate
+spec:
+  template:
+    metadata:
+      labels:
+        job: i3dhub-migrate
+    spec:
+{{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup   : {{ .Values.securityContext.serviceFsGroup }}
+        runAsUser : {{ .Values.securityContext.serviceUser }}
+        runAsGroup: {{ .Values.securityContext.serviceUser }}
+{{- end }}
+{{- if .Values.serviceAccount }}
+      serviceAccount:     {{ .Values.serviceAccount }}
+      serviceAccountName: {{ .Values.serviceAccount }}
+{{- end }}
+{{- if .Values.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.imagePullSecret }}
+{{- end }}
+      initContainers:
+        - name: i3dhub-init-migrate
+          image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-initcheck:{{ .Values.imageTag }}
+{{- if .Values.securityContext.enabled }}
+          securityContext:
+            runAsUser : {{ .Values.securityContext.initUser }}
+            runAsGroup: {{ .Values.securityContext.initUser }}
+{{- if .Values.securityContext.capabilities }}
+            capabilities:
+{{ .Values.securityContext.capabilities | toYaml | indent 14 }}
+{{- end }}
+{{- end }}
+          env:
+            - name: POSTGRES_CONNECTION_STRING
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.credentials.postgres.spaces.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.spaces.runtime.secretKeyRef.key }}
+            - name: CONSUL_ADDRESS
+              value: i3dhub-consul:8500
+      containers:
+        - name: i3dhub-migrate
+          image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-migrate:{{ .Values.imageTag }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
+{{- if and .Values.securityContext.enabled .Values.securityContext.capabilities }}
+          securityContext:
+            capabilities:
+{{ .Values.securityContext.capabilities | toYaml | indent 14 }}
+{{- end }}
+          env:
+            - name: POSTGRES_SPACE_ADMIN_CONNECTION_STRING
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.credentials.postgres.spaces.admin.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.spaces.admin.secretKeyRef.key }}
+            - name: POSTGRES_SPACE_RUNTIME_CONNECTION_STRING
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.credentials.postgres.spaces.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.spaces.runtime.secretKeyRef.key }}
+          volumeMounts:
+            - name: i3dhub-config-service
+              mountPath: {{ include "i3dhub.config.service" . }}
+      volumes:
+        - name: i3dhub-config-service
+          configMap:
+            name: i3dhub-config-service
+      restartPolicy: Never
+
+{{- end }}

helm/templates/query.yml

@@ -45,8 +45,8 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
             - name: RABBIT_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
@@ -74,22 +74,26 @@ spec:
               value: i3dhub-consul:8500
             - name: JAEGER_COLLECTOR_HOSTS
               value: i3dhub-jaeger-collector:14250
-{{- if .Values.elasticStackFeatures.enabled }}
-            - name: ELK_ENABLED
+{{- if .Values.tracing.withJaeger }}
+            - name: I3DH_JAEGER_ELK_ENABLED
               value: "true"
+{{- else if .Values.tracing.withDatadog }}
+            - name: I3DH_DATADOG_ENABLED
+              value: "true"
+{{- end }}
+{{- if .Values.tracing.additionalContainerEnv }}
+{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
 {{- end }}
             - name: AUTHSVC_HOST
               value: 127.0.0.1:6060
             - name: POSTGRES_CONNECTION_STRING
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.credentials.postgres.system.secretKeyRef.name }}
-                  key: {{ .Values.credentials.postgres.system.secretKeyRef.key }}
+                  name: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.name }}
+                  key: {{ .Values.credentials.postgres.system.runtime.secretKeyRef.key }}
           volumeMounts:
             - name: local-i3dhub-log
               mountPath: "/var/log/instant3Dhub"