Merge branch 'main' into feat-smtp-secrets

.github/workflows/build-containers.yml

@@ -38,7 +38,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       # builds container
       - name: Build and push FlowForge Application container
-        uses: docker/[email protected]
+        uses: docker/[email protected].0
         with:
           context: helm/flowforge-container
           file: helm/flowforge-container/Dockerfile
@@ -88,7 +88,7 @@ jobs:
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       - name: Build and push FlowForge Application container
-        uses: docker/[email protected]
+        uses: docker/[email protected].0
         with:
           context: helm/node-red-container
           file: helm/node-red-container/Dockerfile
@@ -138,7 +138,7 @@ jobs:
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       - name: Build and push FlowForge Application container
-        uses: docker/[email protected]
+        uses: docker/[email protected].0
         with:
           context: helm/node-red-container
           file: helm/node-red-container/Dockerfile-2.2.x
@@ -174,7 +174,7 @@ jobs:
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       - name: Build and push FlowForge Application container
-        uses: docker/[email protected]
+        uses: docker/[email protected].0
         with:
           context: helm/node-red-container
           file: helm/node-red-container/Dockerfile-3.1
@@ -210,7 +210,7 @@ jobs:
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       - name: Build and push FlowForge File Server container
-        uses: docker/[email protected]
+        uses: docker/[email protected].0
         with:
           context: helm/file-server
           file: helm/file-server/Dockerfile

CHANGELOG.md

@@ -1,3 +1,28 @@
+#### 2.1.0: Release
+
+ - fix: Update liveness and readiness probe timeout values for broker pod (#316) @ppawlowski
+ - feat: Allow FileStore image to be set (#314) @hardillb
+ - feat: Add default container security context values for broker container (#313) @ppawlowski
+ - fix: Rollback selector labels for existing deployments (#312) @ppawlowski
+ - feat: Allow to run local postgresql database on ARM nodes (#310) @ppawlowski
+ - feat: Add support for Google Analytics (#311) @hardillb
+ - fix: Only run the job if fileStore is enabled (#309) @hardillb
+ - fix: improve the description of the forge.registry field (#308) @hardillb
+ - fix: Ensure both priave ca certs configmaps have default names (#304) @hardillb
+ - ci: Ignore Helm chart related files in images build pipelines (#303) @ppawlowski
+ - feat: Add consistent labels to all resources created by the Helm chart (#302) @ppawlowski
+ - fix: Fix typo missed in review (#301) @hardillb
+ - feat: Add log passthrough support (#300) @hardillb
+ - chore: Create helm chart `upgrade` documentation (#292) @ppawlowski
+ - feat: Add possibility to provide database credentials as an external secret (#296) @ppawlowski
+ - ci: Do not run checkov against subcharts (#297) @ppawlowski
+ - ci: Run checkov against helm chart directory instead of templated yaml (#294) @ppawlowski
+ - ci: fix helm chart validation pipeline to include subdirectories (#293) @ppawlowski
+ - feat: Keep database credentials in kubernetes secrets (#287) @ppawlowski
+ - feat: Add possibility to configure probes for each pod (#291) @ppawlowski
+ - feat: Add `containerSecurityContext` for each container (#289) @ppawlowski
+ - chore: Update actions used to build release containers (#286) @hardillb
+
 #### 2.0.0: Release
 
  - Bump included versions @hardillb

VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

file-server/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@flowfuse/file-server-container",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "private": true,
     "dependencies": {
-        "@flowfuse/file-server": "^2.0.0"
+        "@flowfuse/file-server": "^2.1.0"
     },
     "license": "Apache-2.0"
 }

flowforge-container/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@flowfuse/flowfuse-k8s",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "description": "FlowFuse in Docker",
     "private": true,
     "author": {
         "name": "FlowForge Inc."
     },
     "dependencies": {
-        "@flowfuse/flowfuse": "^2.0.1",
-        "@flowfuse/driver-kubernetes": "^2.0.1",
+        "@flowfuse/flowfuse": "^2.1.0",
+        "@flowfuse/driver-kubernetes": "^2.1.0",
         "pg": "^8.7.1",
         "pg-hstore": "^2.3.4"
     },

helm/flowforge/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: "v2"
 name: "flowforge"
-version: "2.0.1"
+version: "2.1.0"
 description: "FlowForge"
 type: "application"
 home: "https://flowforge.com"
@@ -16,4 +16,4 @@ dependencies:
 maintainers:
   - name: "FlowForge Inc"
     url: "https://flowforge.com"
-appVersion: "2.0.1"
+appVersion: "2.1.0"

helm/flowforge/README.md

@@ -222,11 +222,11 @@ Note: External secret must contain following keys:
 
 Following values can be used to configure the liveness, readiness and startup probes for all pods:
 
-- `initialDelaySeconds` (default `10`) - number of seconds after the container has started before liveness or readiness probes are initiated
-- `periodSeconds` (default `10`) - how often (in seconds) to perform the probe
-- `timeoutSeconds` (default `5`) - number of seconds after which the probe times out
-- `successThreshold` (default `1`) - minimum consecutive successes for the probe to be considered successful after having failed
-- `failureThreshold` (default `3`) - minimum consecutive failures for the probe to be considered failed after having succeeded
+- `initialDelaySeconds` - number of seconds after the container has started before liveness or readiness probes are initiated
+- `periodSeconds` - how often (in seconds) to perform the probe
+- `timeoutSeconds` - number of seconds after which the probe times out
+- `successThreshold` - minimum consecutive successes for the probe to be considered successful after having failed
+- `failureThreshold` - minimum consecutive failures for the probe to be considered failed after having succeeded
 
 Example for readiness probe:
 ```yaml

helm/flowforge/values.yaml

@@ -29,13 +29,13 @@ forge:
     livenessProbe:
       initialDelaySeconds: 10
       periodSeconds: 10
-      timeoutSeconds: 5
+      timeoutSeconds: 15
       successThreshold: 1
-      failureThreshold: 3
+      failureThreshold: 5
     readinessProbe:
       initialDelaySeconds: 10
       periodSeconds: 10
-      timeoutSeconds: 5
+      timeoutSeconds: 15
       successThreshold: 1
       failureThreshold: 3
     containerSecurityContext:

node-red-container/Dockerfile-3.1

@@ -1,4 +1,4 @@
-FROM nodered/node-red:3.1.3-18
+FROM nodered/node-red:3.1.5-18
 
 ARG REGISTRY
 ARG REGISTRY_TOKEN

node-red-container/package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-red-project",
     "description": "A Node-RED Project",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "private": true,
     "dependencies": {}
 }