print: update browserless to v2

Remove unsupported parameters:
https://docs.browserless.io/baas/migrate#removed-parameters-no-replacements

Rename changed parameters:
https://docs.browserless.io/baas/migrate#changed-parameters

closes: ecamp#8028

Author: BacLuc

.helm/ecamp3/templates/_helpers.tpl

@@ -56,6 +56,19 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end }}
 
+{{/*
+Name for all print+browserless resources.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "print-browserless.name" -}}
+{{- $name := default .Chart.Name .Values.chartNameOverride }}
+{{- if contains $name (include "app.name" .) }}
+{{- printf "%s-print-browserless" (include "app.name" .) | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s-print-browserless" (include "app.name" .) $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+
 {{/*
 Name for all dummy-mailserver-related resources.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -266,3 +279,28 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Reuse existing secret value, else generate new one
+Parameters:
+- namespace
+- secretName: name of the secret to lookup
+- key: the key within the secret to retrieve/generate
+*/}}
+{{- define "gen.secret" }}
+{{- $namespace := .namespace }}
+{{- $secretName := .secretName }}
+{{- $key := .key }}
+{{- $secret := lookup "v1" "Secret" $namespace $secretName }}
+{{- if $secret -}}
+{{/*
+   Reusing existing secret data
+*/}}
+{{- $key }}: {{ index $secret.data $key }}
+{{- else -}}
+{{/*
+    Generate new data
+*/}}
+{{- $key }}: {{ randAlphaNum 20 | b64enc }}
+{{- end -}}
+{{- end -}}

.helm/ecamp3/templates/browserless_configmap.yaml

@@ -6,6 +6,6 @@ metadata:
     {{- include "browserless.selectorLabels" . | nindent 4 }}
     {{- include "app.commonLabels" . | nindent 4 }}
 data:
-  MAX_CONCURRENT_SESSIONS: {{ .Values.browserless.maxConcurrentSessions | quote }}
-  CONNECTION_TIMEOUT: {{ .Values.browserless.connectionTimeout | quote }}
-  MAX_QUEUE_LENGTH: {{ .Values.browserless.maxQueueLength | quote }}
+  CONCURRENT: {{ .Values.browserless.maxConcurrentSessions | quote }}
+  TIMEOUT: {{ .Values.browserless.connectionTimeout | quote }}
+  QUEUED: {{ .Values.browserless.maxQueueLength | quote }}

.helm/ecamp3/templates/browserless_deployment.yaml

@@ -35,18 +35,20 @@ spec:
               containerPort: 3000
               protocol: TCP
           readinessProbe:
-            httpGet:
-              scheme: HTTP
-              path: /pressure
-              port: 3000
+            exec:
+              command:
+                - sh
+                - "-c"
+                - "curl --fail -q localhost:3000/pressure?token=${TOKEN}"
             initialDelaySeconds: 20
             periodSeconds: 10
             timeoutSeconds: 5
           livenessProbe:
-            httpGet:
-              scheme: HTTP
-              path: /pressure
-              port: 3000
+            exec:
+              command:
+                - sh
+                - "-c"
+                - "curl --fail -q localhost:3000/pressure?token=${TOKEN}"
             initialDelaySeconds: 20
             periodSeconds: 10
             timeoutSeconds: 5
@@ -56,14 +58,9 @@ spec:
             - configMapRef:
                 name: {{ include "browserless.name" . }}-configmap
           env:
-            - name: PREBOOT_CHROME
-              value: "true"
-            - name: KEEP_ALIVE
-              value: "true"
-            - name: ENABLE_DEBUGGER
-              value: "false"
-            - name: FUNCTION_ENABLE_INCOGNITO_MODE
-              value: "true"
-            - name: DISABLED_FEATURES
-              value: '["downloadEndpoint","functionEndpoint","pdfEndpoint","screencastEndpoint","scrapeEndpoint","statsEndpoint","workspaces"]'
-{{- end }}
+            - name: TOKEN
+              valueFrom:
+                secretKeyRef:
+                  key: BROWSERLESS_TOKEN
+                  name: {{ include "print-browserless.name" . }}
+{{- end }}

.helm/ecamp3/templates/print_browserless_secrets.yaml

@@ -0,0 +1,11 @@
+{{ $secretName := include "print-browserless.name" . }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $secretName }}
+  labels:
+    {{- include "print.selectorLabels" . | nindent 4 }}
+    {{- include "app.commonLabels" . | nindent 4 }}
+type: Opaque
+data:
+  {{- include "gen.secret" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "BROWSERLESS_TOKEN") | nindent 2 }}

.helm/ecamp3/templates/print_deployment.yaml

@@ -72,6 +72,11 @@ spec:
                 secretKeyRef:
                   name: {{ include "print.name" . }}
                   key: browser-ws-endpoint
+            - name: NUXT_BROWSERLESS_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "print-browserless.name" . }}
+                  key: BROWSERLESS_TOKEN
             - name: NITRO_PORT
               value: "3003"
             {{- if and .Values.ingress.enabled .Values.ingress.basicAuth.enabled }}

.helm/ecamp3/values.yaml

@@ -112,10 +112,10 @@ browserless:
   enabled: true
   domain:
   image:
-    repository: "docker.io/browserless/chrome"
+    repository: "ghcr.io/browserless/chrome"
     pullPolicy: IfNotPresent
-    # renovate: datasource=docker depName=browserless/chrome
-    tag: "1.61.1-puppeteer-21.4.1"
+    # renovate: datasource=docker depName=ghcr.io/browserless/chrome
+    tag: "v2.34.1"
   service:
     type: ClusterIP
     port: 3000

docker-compose.yml

@@ -169,19 +169,16 @@ services:
     restart: on-failure
 
   browserless:
-    image: browserless/chrome:1.61.1-puppeteer-21.9.0
+    image: ghcr.io/browserless/chrome:v2.34.1
     container_name: 'ecamp3-browserless'
     ports:
       - '3010:3000'
     environment:
-      - MAX_CONCURRENT_SESSIONS=1
-      - CONNECTION_TIMEOUT=40000
-      - MAX_QUEUE_LENGTH=10
-      - PREBOOT_CHROME=true
-      - KEEP_ALIVE=true
+      - TOKEN=1234
+      - CONCURRENT=1
+      - TIMEOUT=40000
+      - QUEUED=10
       - ENABLE_DEBUGGER=false
-      - DISABLED_FEATURES=["downloadEndpoint","functionEndpoint","pdfEndpoint","screencastEndpoint","scrapeEndpoint","statsEndpoint","workspaces"]
-      - FUNCTION_ENABLE_INCOGNITO_MODE=true
 
   e2e:
     image: cypress/included:15.4.0@sha256:2039347f99ef06ba66f8365361b7e869b7ba00e5d9437958f1df4c499909ec14

print/nuxt.config.js

@@ -64,6 +64,7 @@ export default defineNuxtConfig({
   runtimeConfig: {
     basicAuthToken: null,
     browserWsEndpoint: 'ws://browserless:3000',
+    browserlessToken: '1234',
     printUrl: 'http://print:3003/print',
     internalApiRootUrl: 'http://api:3000/api',
     cookiePrefix: 'localhost_',

print/server/api/pdf.js

@@ -41,6 +41,7 @@ export default defineEventHandler(async (event) => {
   const {
     basicAuthToken,
     browserWsEndpoint,
+    browserlessToken,
     printUrl,
     cookiePrefix,
     renderHtmlTimeoutMs,
@@ -62,7 +63,7 @@ export default defineEventHandler(async (event) => {
 
     // Connect to browserless.io (puppeteer websocket)
     browser = await puppeteer.connect({
-      browserWSEndpoint: browserWsEndpoint,
+      browserWSEndpoint: browserWsEndpoint + `/chrome?token=${browserlessToken}`,
     })
     const context = await browser.createBrowserContext()
     measurePerformance(performanceMeasurements, 'puppeteer_connect')