Merge branch 'main' into file-store-image

FlowFuse · Feb 14, 2024 · 7432eeb · 7432eeb
2 parents e6fd3d3 + 0a1c858
commit 7432eeb
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,15 +9,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 16.x
     - name: Install Helm
-      uses: azure/setup-helm@v1
+      uses: azure/setup-helm@v4.0.0
       with:
-        version: v3.5.2
+        version: v3.11.0
     - name: test
       run: |
         cd test

diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md
@@ -100,8 +100,11 @@ Enables FlowForge Telemetry
  - `forge.telemetry.sentry.backend_dsn` enables sentry reporting if set (default unset)
  - `forge.telemetry.sentry.production_mode` rate limit reporting (default `true`)
  - `forge.telemetry.sentry.environment` set SENTRY_ENV environment variable, which overrides NODE_ENV for the reported environment (default unset)
+ - `forge.telemetry.google.tag` a Google Analytics Tag Account ID (default unset)
+ - `forge.telemetry.google.events` an object containing keys matching events to track and values to be included (default unset)
  - `forge.telemetry.backend.prometheus.enabled` enables the `/metrics` endpoint on the forge app for scraping by Prometheus
 
+
  ### Support
 
  Enables HubSpot support widget in the FlowForge app

diff --git a/helm/flowforge/templates/_helpers.tpl b/helm/flowforge/templates/_helpers.tpl
@@ -27,24 +27,34 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Forge Selector labels
 */}}
 {{- define "forge.forgeSelectorLabels" -}}
+{{/*
 {{ include "forge.commonSelectorLabels" . }}
 app.kubernetes.io/component: "forge"
+*/}}
+app: flowforge
 {{- end }}
 
 {{/*
 Broker Selector labels
 */}}
+
 {{- define "forge.brokerSelectorLabels" -}}
+{{/* 
 {{ include "forge.commonSelectorLabels" . }}
 app.kubernetes.io/component: "broker"
+*/}}
+app: flowforge-broker
 {{- end }}
 
 {{/*
 FileStore Selector labels
 */}}
 {{- define "forge.fileStoreSelectorLabels" -}}
+{{/*
 {{ include "forge.commonSelectorLabels" . }}
 app.kubernetes.io/component: "file-server"
+*/}}
+app: flowforge-file
 {{- end }}
 
 {{/*

diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml
@@ -164,6 +164,14 @@ data:
           production_mode: true
           {{ end }}
         {{ end -}}
+        {{ if and (hasKey .Values.forge.telemetry "google") (hasKey .Values.forge.telemetry.google "tag") }}
+        google:
+          tag: {{ .Values.forge.telemetry.google.tag }}
+          {{ if hasKey .Values.forge.telemetry.google "events" }}
+          events:
+{{ toYaml .Values.forge.telemetry.google.events | indent 12 }}
+          {{ end }}
+        {{ end }}
       {{- end }}
       backend:
         {{ if and (hasKey .Values.forge.telemetry "sentry") (hasKey .Values.forge.telemetry.sentry "backend_dsn") -}}

diff --git a/helm/flowforge/values.schema.json b/helm/flowforge/values.schema.json
@@ -362,6 +362,20 @@
                                 }
                             }
                         },
+                        "google": {
+                            "type": "object",
+                            "properties": {
+                                "tag": {
+                                    "type": "string"
+                                },
+                                "events": {
+                                    "type": "object"
+                                }
+                            },
+                            "required": [
+                                "tag"
+                            ]
+                        },
                         "backend": {
                             "type": "object",
                             "properties": {

diff --git a/helm/flowforge/values.yaml b/helm/flowforge/values.yaml
@@ -38,6 +38,9 @@ forge:
       timeoutSeconds: 5
       successThreshold: 1
       failureThreshold: 3
+    containerSecurityContext:
+      allowPrivilegeEscalation: false
+      readOnlyRootFilesystem: true
     labels: {}
     podLabels: {}
 
@@ -110,6 +113,8 @@ forge:
   logPassthrough: false
 
 postgresql:
+  image:
+    tag: "14.10.0-debian-11-r30"
   auth:
     postgresPassword: Moomiet0
     username: forge