CircleCI commit for version '2.21.1-branch.testing2.178374-d72c9de'

specklesystems · Sep 11, 2024 · 24e5c38 · 24e5c38
1 parent 6ff8085
commit 24e5c38
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 93 deletions.
diff --git a/charts/speckle-server-branch-testing2/Chart.yaml b/charts/speckle-server-branch-testing2/Chart.yaml
@@ -5,7 +5,7 @@ apiVersion: v2
 # It is recommended to use it with quotes.
 
 # Set by the build process to the correct value
-appVersion: '2.20.6-branch.testing2.153813-e1ae354'
+appVersion: '2.21.1-branch.testing2.178374-d72c9de'
 description: Speckle Server
 home: 'https://speckle.systems/'
 icon: 'https://speckle.xyz/logo.svg'
@@ -21,4 +21,4 @@ type: application
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
 # Set by the build process to the correct value
-version: 2.20.6-branch.testing2.153813-e1ae354
+version: 2.21.1-branch.testing2.178374-d72c9de
diff --git a/charts/speckle-server-branch-testing2/templates/_helpers.tpl b/charts/speckle-server-branch-testing2/templates/_helpers.tpl
@@ -839,18 +839,6 @@ Generate the environment variables for Speckle server and Speckle objects deploy
   value: "{{ .Values.server.mailchimp.onboardingStepId}}"
 {{- end }}
 
-# *** Tracking / Tracing ***
-- name: SENTRY_DSN
-  value: {{ .Values.server.sentry_dns }}
-{{- if .Values.server.disable_tracing }}
-- name: DISABLE_TRACING
-  value: "true"
-{{- end }}
-{{- if .Values.server.disable_tracking }}
-- name: DISABLE_TRACKING
-  value: "true"
-{{- end }}
-
 # Monitoring - Apollo
 {{- if .Values.server.monitoring.apollo.enabled }}
 - name: APOLLO_GRAPH_ID

diff --git a/charts/speckle-server-branch-testing2/templates/objects/deployment.yml b/charts/speckle-server-branch-testing2/templates/objects/deployment.yml
@@ -68,11 +68,9 @@ spec:
           periodSeconds: 10
           failureThreshold: 60 # 10*60 = 600s; accounts for long-running db migrations
           timeoutSeconds: 3
-          exec:
-            command:
-              - node
-              - -e
-              - "try { require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/liveness', method: 'GET', timeout: 2000 }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(res.statusCode != 200 || body.toLowerCase().includes('error'));}); }).end(); } catch { process.exit(1); }"
+          httpGet:
+            path: /liveness
+            port: {{ include "server.port" $ }}
 
         livenessProbe:
           periodSeconds: 60

diff --git a/charts/speckle-server-branch-testing2/templates/objects/networkpolicy.cilium.yml b/charts/speckle-server-branch-testing2/templates/objects/networkpolicy.cilium.yml
@@ -51,10 +51,6 @@ spec:
 {{- if .Values.server.monitoring.apollo.enabled }}
               - matchPattern: "*.api.apollographql.com"
 {{- end }}
-{{- if .Values.server.sentry_dns }}
-              # DNS lookup for sentry
-              - matchPattern: "*.ingest.sentry.io"
-{{- end }}
 {{- if (ne "false" .Values.server.monitoring.mp.enabled) }}
               - matchName: 'analytics.speckle.systems'
 {{- end }}
@@ -104,15 +100,6 @@ spec:
             - port: "443"
               protocol: TCP
 {{- end }}
-{{- if .Values.server.sentry_dns }}
-    # egress to sentry
-    - toCIDRSet:
-        - cidr: 34.120.195.249/32
-      toPorts:
-        - ports:
-            - port: "443"
-              protocol: TCP
-{{- end }}
 {{- if .Values.server.email.enabled }}
     # email server
 {{ include "speckle.networkpolicy.egress.email.cilium" $ | indent 4 }}

diff --git a/charts/speckle-server-branch-testing2/templates/objects/networkpolicy.kubernetes.yml b/charts/speckle-server-branch-testing2/templates/objects/networkpolicy.kubernetes.yml
@@ -37,14 +37,6 @@ spec:
       ports:
         - port: 443
 {{- end }}
-{{- if .Values.server.sentry_dns }}
-    # sentry.io https://docs.sentry.io/product/security/ip-ranges/#event-ingestion
-    - to:
-      - ipBlock:
-          cidr: 34.120.195.249/32
-      ports:
-        - port: 443
-{{- end }}
 {{- if .Values.server.email.enabled }}
     # email server
 {{ include "speckle.networkpolicy.egress.email" $ | indent 4 }}

diff --git a/charts/speckle-server-branch-testing2/templates/objects/serviceaccount.yml b/charts/speckle-server-branch-testing2/templates/objects/serviceaccount.yml
@@ -32,5 +32,11 @@ secrets:
 {{- if .Values.server.monitoring.apollo.enabled }}
   - name: {{ default .Values.secretName .Values.server.monitoring.apollo.key.secretName }}
 {{- end }}
+{{- if .Values.featureFlags.automateModuleEnabled }}
+  - name: encryption-keys
+{{- end }}
+{{- if .Values.featureFlags.workspaceModuleEnabled }}
+  - name: {{ default .Values.secretName .Values.server.licenseTokenSecret.secretName }}
+{{- end }}
 
 {{- end -}}
diff --git a/charts/speckle-server-branch-testing2/templates/preview_service/deployment.yml b/charts/speckle-server-branch-testing2/templates/preview_service/deployment.yml
@@ -35,7 +35,7 @@ spec:
             command:
               - node
               - -e
-              - process.exit(Date.now() - require('fs').readFileSync('/tmp/last_successful_query', 'utf8') > 3600 * 1000)
+              - {{ printf "process.exit(Date.now() - require('fs').readFileSync('/tmp/last_successful_query', 'utf8') > %s)" .Values.preview_service.puppeteer.timeoutMilliseconds }}
 
         resources:
           requests:
@@ -62,6 +62,10 @@ spec:
         {{- end }}
 
         env:
+          - name: HOST
+            value: '127.0.0.1' # Only accept connections from localhost, as preview service does not need to be exposed outside the container.
+          - name: METRICS_HOST
+            value: '0.0.0.0' # Expose metrics outside of the container so it can be scraped by Prometheus
           - name: PORT
             value: {{ .Values.preview_service.port | quote }}
 
@@ -84,6 +88,16 @@ spec:
             value: "/postgres-certificate/ca-certificate.crt"
           {{- end }}
 
+          {{- if .Values.preview_service.puppeteer.userDataDirectory }}
+          - name: USER_DATA_DIR
+            value: {{ .Values.preview_service.puppeteer.userDataDirectory | quote }}
+          {{- end }}
+
+          {{- if .Values.preview_service.puppeteer.timeoutMilliseconds }}
+          - name: PREVIEW_TIMEOUT
+            value: {{ .Values.preview_service.puppeteer.timeoutMilliseconds | quote }}
+          {{- end }}
+
       {{- if .Values.preview_service.affinity }}
       affinity: {{- include "speckle.renderTpl" (dict "value" .Values.preview_service.affinity "context" $) | nindent 8 }}
       {{- end }}

diff --git a/charts/speckle-server-branch-testing2/templates/server/deployment.yml b/charts/speckle-server-branch-testing2/templates/server/deployment.yml
@@ -73,11 +73,9 @@ spec:
           periodSeconds: 10
           failureThreshold: 60 # 10*60 = 600s; accounts for long-running db migrations
           timeoutSeconds: 3
-          exec:
-            command:
-              - node
-              - -e
-              - "try { require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/liveness', method: 'GET', timeout: 2000 }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(res.statusCode != 200 || body.toLowerCase().includes('error'));}); }).end(); } catch { process.exit(1); }"
+          httpGet:
+            path: /liveness
+            port: {{ include "server.port" $ }}
 
         livenessProbe:
           periodSeconds: 60

diff --git a/charts/speckle-server-branch-testing2/templates/server/networkpolicy.cilium.yml b/charts/speckle-server-branch-testing2/templates/server/networkpolicy.cilium.yml
@@ -51,10 +51,6 @@ spec:
 {{- if .Values.server.monitoring.apollo.enabled }}
               - matchPattern: "*.api.apollographql.com"
 {{- end }}
-{{- if .Values.server.sentry_dns }}
-              # DNS lookup for sentry
-              - matchPattern: "*.ingest.sentry.io"
-{{- end }}
 {{- if (ne "false" .Values.server.monitoring.mp.enabled) }}
               - matchName: 'analytics.speckle.systems'
 {{- end }}
@@ -104,15 +100,6 @@ spec:
             - port: "443"
               protocol: TCP
 {{- end }}
-{{- if .Values.server.sentry_dns }}
-    # egress to sentry
-    - toCIDRSet:
-        - cidr: 34.120.195.249/32
-      toPorts:
-        - ports:
-            - port: "443"
-              protocol: TCP
-{{- end }}
 {{- if .Values.server.email.enabled }}
     # email server
 {{ include "speckle.networkpolicy.egress.email.cilium" $ | indent 4 }}

diff --git a/charts/speckle-server-branch-testing2/templates/server/networkpolicy.kubernetes.yml b/charts/speckle-server-branch-testing2/templates/server/networkpolicy.kubernetes.yml
@@ -37,14 +37,6 @@ spec:
       ports:
         - port: 443
 {{- end }}
-{{- if .Values.server.sentry_dns }}
-    # sentry.io https://docs.sentry.io/product/security/ip-ranges/#event-ingestion
-    - to:
-      - ipBlock:
-          cidr: 34.120.195.249/32
-      ports:
-        - port: 443
-{{- end }}
 {{- if .Values.server.email.enabled }}
     # email server
 {{ include "speckle.networkpolicy.egress.email" $ | indent 4 }}

diff --git a/charts/speckle-server-branch-testing2/values.schema.json b/charts/speckle-server-branch-testing2/values.schema.json
@@ -554,12 +554,12 @@
         "max_object_size_mb": {
           "type": "number",
           "description": "The maximum size of an individual object which can be uploaded to the server",
-          "default": 10
+          "default": 100
         },
         "max_object_upload_file_size_mb": {
           "type": "number",
-          "description": "Objects are batched together and uploaded to the /objects endpoint as http POST form data. This determines the maximum size of that form data which can be uploaded to the server",
-          "default": 50
+          "description": "Objects are batched together and uploaded to the /objects endpoint as http POST form data. This determines the maximum size of that form data which can be uploaded to the server. It should be greater than or equal to max_object_size_mb.",
+          "default": 100
         },
         "max_project_models_per_page": {
           "type": "number",
@@ -1223,11 +1223,6 @@
             }
           }
         },
-        "sentry_dns": {
-          "type": "string",
-          "description": "(Optional) The Data Source Name that was provided by Sentry.io",
-          "default": ""
-        },
         "disable_tracking": {
           "type": "boolean",
           "description": "If set to true, will prevent tracking metrics from being collected",
@@ -1310,11 +1305,6 @@
             }
           }
         },
-        "max_object_size_mb": {
-          "type": "number",
-          "description": "The maximum size of an individual object which can be uploaded to the server",
-          "default": 10
-        },
         "requests": {
           "type": "object",
           "properties": {
@@ -1676,6 +1666,21 @@
             }
           }
         },
+        "puppeteer": {
+          "type": "object",
+          "properties": {
+            "userDataDirectory": {
+              "type": "string",
+              "description": "The path to the user data directory. If not set, defaults to '/tmp/puppeteer'. This is mounted in the deployment as a volume with read-write access.",
+              "default": ""
+            },
+            "timeoutMilliseconds": {
+              "type": "string",
+              "description": "The timeout in milliseconds for the Puppeteer service.",
+              "default": "3600000"
+            }
+          }
+        },
         "requests": {
           "type": "object",
           "properties": {

diff --git a/charts/speckle-server-branch-testing2/values.yaml b/charts/speckle-server-branch-testing2/values.yaml
@@ -71,7 +71,7 @@ ingress:
 ##
 ## @param docker_image_tag Speckle is published as a Docker Image.  The version of the image which will be deployed is specified by this tag.
 ##
-docker_image_tag: '2.20.6-branch.testing2.153813-e1ae354'
+docker_image_tag: '2.21.1-branch.testing2.178374-d72c9de'
 ## @param imagePullPolicy Determines the conditions when the Docker Images for Speckle should be pulled from the Image registry.
 ## ref: https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
 ##
@@ -399,9 +399,9 @@ server:
   ## @param server.weeklyDigestEnabled Enables sending out the serevr weekly digest emails
   weeklyDigestEnabled: false
   ## @param server.max_object_size_mb The maximum size of an individual object which can be uploaded to the server
-  max_object_size_mb: 10
-  ## @param server.max_object_upload_file_size_mb Objects are batched together and uploaded to the /objects endpoint as http POST form data. This determines the maximum size of that form data which can be uploaded to the server
-  max_object_upload_file_size_mb: 50
+  max_object_size_mb: 100
+  ## @param server.max_object_upload_file_size_mb Objects are batched together and uploaded to the /objects endpoint as http POST form data. This determines the maximum size of that form data which can be uploaded to the server. It should be greater than or equal to max_object_size_mb.
+  max_object_upload_file_size_mb: 100
   ## @param server.max_project_models_per_page The maximum number of models that can be returned in a single page of a query for all models of a project
   max_project_models_per_page: 500
   ## @param server.speckleAutomateUrl The url of the Speckle Automate instance
@@ -721,17 +721,10 @@ server:
         secretKey: ''
     ## @param server.monitoring.mp (Optional) If server.monitoring.mp.enabled is set to false, metrics will not be collected by the Speckle server.
     mp: {}
-  ## @param server.sentry_dns (Optional) The Data Source Name that was provided by Sentry.io
-  ## Sentry.io allows events within Speckle to be monitored
-  ##
-
-  sentry_dns: ''
   ## @param server.disable_tracking If set to true, will prevent tracking metrics from being collected
-  ## Setting this value to false requires `sentry_dns` to be set
   ##
   disable_tracking: false
   ## @param server.disable_tracing If set to true, will prevent tracing metrics from being collected
-  ## Setting this value to false requires `sentry_dns` to be set
   ##
   disable_tracing: false
   networkPolicy:
@@ -779,8 +772,6 @@ objects:
     enabled: false
     ## @param objects.inspect.port The port on which the nodejs inspect feature should be exposed
     port: '7000'
-  ## @param objects.max_object_size_mb The maximum size of an individual object which can be uploaded to the server
-  max_object_size_mb: 10
   requests:
     ## @param objects.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/
@@ -1015,6 +1006,11 @@ preview_service:
   monitoring:
     ## @param preview_service.monitoring.metricsPort The port on which the metrics server will be exposed.
     metricsPort: '9094'
+  puppeteer:
+    ## @param preview_service.puppeteer.userDataDirectory The path to the user data directory. If not set, defaults to '/tmp/puppeteer'. This is mounted in the deployment as a volume with read-write access.
+    userDataDirectory: ''
+    ## @param preview_service.puppeteer.timeoutMilliseconds The timeout in milliseconds for the Puppeteer service.
+    timeoutMilliseconds: '3600000'
   requests:
     ## @param preview_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/