fix(server): env var definitions

packages/server/package.json

@@ -40,6 +40,7 @@
     "@mailchimp/mailchimp_marketing": "^3.0.80",
     "@sentry/node": "^6.17.9",
     "@sentry/tracing": "^6.17.9",
+    "@speckle/objectloader": "workspace:^",
     "@speckle/shared": "workspace:^",
     "@types/mailchimp__mailchimp_marketing": "^3.0.9",
     "@types/pino-http": "^5.8.1",
@@ -98,8 +99,7 @@
     "undici": "^5.19.1",
     "verror": "^1.10.1",
     "xml-escape": "^1.1.0",
-    "zxcvbn": "^4.4.2",
-    "@speckle/objectloader": "workspace:^"
+    "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
     "@apollo/rover": "^0.14.1",

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

@@ -66,11 +66,6 @@ spec:
             value: {{ .Values.frontend_2.logClientApiToken }}
           - name: NUXT_PUBLIC_LOG_CLIENT_API_ENDPOINT
             value: {{ .Values.frontend_2.logClientApiEndpoint }}
-          - name: ONBOARDING_STREAM_URL
-            value: {{ .Values.frontend_2.onboarding.stream_url }}
-          - name: ONBOARDING_STREAM_CACHE_BUST_NUMBER
-            value: {{ .Values.frontend_2.onboarding.stream_cache_bust_number }}
-
 
       priorityClassName: high-priority
       {{- if .Values.frontend_2.affinity }}

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

@@ -108,8 +108,10 @@ spec:
             value: http://{{ .Values.domain }}
             {{- end }}
 
-          - name: ONBOARDING_STREAM_ID
-            value: {{ .Values.server.onboardingStreamId }}
+          - name: ONBOARDING_STREAM_URL
+            value: {{ .Values.server.onboarding.stream_url }}
+          - name: ONBOARDING_STREAM_CACHE_BUST_NUMBER
+            value: {{ .Values.server.onboarding.stream_cache_bust_number }}
 
           - name: SESSION_SECRET
             valueFrom:

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

@@ -466,6 +466,21 @@
           "description": "The minimum level of logs which will be output. Suitable values are trace, debug, info, warn, error, fatal, or silent",
           "default": "info"
         },
+        "onboarding": {
+          "type": "object",
+          "properties": {
+            "stream_url": {
+              "type": "string",
+              "description": "The (cross-server) URL to the project/stream that should be used as the onboarding project base.",
+              "default": "https://latest.speckle.systems/projects/843d07eb10"
+            },
+            "stream_cache_bust_number": {
+              "type": "number",
+              "description": "Increase this number to trigger the re-pulling of the base stream",
+              "default": 1
+            }
+          }
+        },
         "inspect": {
           "type": "object",
           "properties": {
@@ -1162,21 +1177,6 @@
           "description": "The number of instances of the Frontend 2 server prod to be deployed withing the cluster.",
           "default": 1
         },
-        "onboarding": {
-          "type": "object",
-          "properties": {
-            "stream_url": {
-              "type": "string",
-              "description": "The (cross-server) URL to the project/stream that should be used as the onboarding project base.",
-              "default": "https://latest.speckle.systems/projects/843d07eb10"
-            },
-            "stream_cache_bust_number": {
-              "type": "number",
-              "description": "Increase this number to trigger the re-pulling of the base stream",
-              "default": 1
-            }
-          }
-        },
         "requests": {
           "type": "object",
           "properties": {

utils/helm/speckle-server/values.yaml

@@ -376,7 +376,13 @@ server:
   ## @param server.logLevel The minimum level of logs which will be output. Suitable values are trace, debug, info, warn, error, fatal, or silent
   ##
   logLevel: 'info'
-
+  onboarding:
+    ## @param server.onboarding.stream_url The (cross-server) URL to the project/stream that should be used as the onboarding project base.
+    ##
+    stream_url: 'https://latest.speckle.systems/projects/843d07eb10'
+    ## @param server.onboarding.stream_cache_bust_number Increase this number to trigger the re-pulling of the base stream
+    ##
+    stream_cache_bust_number: 1
   inspect:
     ## @param server.inspect.enabled If enabled, indicates that the Speckle server should be deployed with the nodejs inspect feature enabled
     enabled: false
@@ -771,13 +777,6 @@ frontend_2:
   ## @param frontend_2.replicas The number of instances of the Frontend 2 server prod to be deployed withing the cluster.
   ##
   replicas: 1
-  onboarding:
-    ## @param frontend_2.onboarding.stream_url The (cross-server) URL to the project/stream that should be used as the onboarding project base.
-    ##
-    stream_url: 'https://latest.speckle.systems/projects/843d07eb10'
-    ## @param frontend_2.onboarding.stream_cache_bust_number Increase this number to trigger the re-pulling of the base stream
-    ##
-    stream_cache_bust_number: 1
   requests:
     ## @param frontend_2.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/