Merge branch 'main' into emqx

FlowFuse · Oct 30, 2024 · 00582d9 · 00582d9
2 parents 8609dc9 + 40326b8
commit 00582d9
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 23 deletions.
diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml
@@ -29,7 +29,7 @@ concurrency:
 jobs:
   build:
     name: Build single-architecture container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.36.0
     with:
       image_name: 'file-server'
       package_dependencies: |
@@ -45,7 +45,7 @@ jobs:
     if: github.ref_name == 'main'
     name: Upload image to staging registry
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'file-server'
@@ -63,7 +63,7 @@ jobs:
     if: github.ref_name == 'main'
     name: Upload image to production registry
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'file-server'
@@ -118,7 +118,7 @@ jobs:
     if: false
     name: Deploy to staging environment
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'file-server'
@@ -136,7 +136,7 @@ jobs:
     if: false
     name: Deploy to production environment
     needs: [build, deploy-stage]
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'file-server'

diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   build:
     name: Build single-architecture container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.36.0
     with:
       image_name: 'forge-k8s'
       package_dependencies: |
@@ -48,7 +48,7 @@ jobs:
     name: Upload image to staging registry
     needs: build
     # needs: build-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'forge-k8s'
@@ -68,7 +68,7 @@ jobs:
     name: Upload image to production registry
     # needs: build-multi-architecture
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'forge-k8s'
@@ -124,7 +124,7 @@ jobs:
     if: false
     name: Deploy to staging environment
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'forge-k8s'
@@ -142,7 +142,7 @@ jobs:
     if: false
     name: Deploy to production environment
     needs: [build, deploy-stage]
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'forge-k8s'

diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
@@ -30,7 +30,7 @@ jobs:
           version: v3.13.2
 
       - name: Install Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: 3.9
 

diff --git a/.github/workflows/nodered-container.yml b/.github/workflows/nodered-container.yml
@@ -29,7 +29,7 @@ concurrency:
 jobs:
   build-302:
     name: Build 3.0.2 container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.36.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile
@@ -49,7 +49,7 @@ jobs:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-302
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -67,7 +67,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-302
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'node-red'
@@ -84,7 +84,7 @@ jobs:
 
   build-223:
     name: Build 2.2.3 container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.36.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-2.2.x
@@ -103,7 +103,7 @@ jobs:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-223
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -121,7 +121,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-223
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'node-red'
@@ -138,7 +138,7 @@ jobs:
 
   build-310:
     name: Build 3.1.x container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.36.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-3.1
@@ -157,7 +157,7 @@ jobs:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-310
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -175,7 +175,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-310
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'node-red'
@@ -192,7 +192,7 @@ jobs:
 
   build-40:
     name: Build 4.0.x container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.36.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-4.0
@@ -211,7 +211,7 @@ jobs:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-40
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -229,7 +229,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-40
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.34.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.36.0
     with:
       environment: production
       service_name: 'node-red'

diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md
@@ -51,6 +51,7 @@ For other values please refer to the documentation below.
  - `forge.podLabels` allows to add custom labels to the core application pod (default `{}`)
  - `forge.replicas` allows the number of instances of the FlowFuse App to be set. Scaling only supported with ingress-nginx controller (default `1`)
  - `forge.tolerations` allows to configure [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for the core application deployment (default `[]`)
+ - `forge.priorityClassName` allows to set [priorityClassName](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/) for all deployments created by this Helm chart (default not set)
 
 
 note: `forge.projectSelector` and `forge.managementSelector` defaults mean that you must have at least 2 nodes in your cluster and they need to be labeled before installing.

diff --git a/helm/flowforge/templates/broker.yaml b/helm/flowforge/templates/broker.yaml
@@ -28,6 +28,9 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.forge.priorityClassName }}
+      priorityClassName: "{{ .Values.forge.priorityClassName}}"
+      {{- end }}
       automountServiceAccountToken: false
       securityContext:
         {{- toYaml .Values.forge.broker.podSecurityContext | nindent 8 }}

diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml
@@ -35,6 +35,9 @@ spec:
         prometheus.io/path: "/metrics"
         {{- end  }}
     spec:
+      {{- if .Values.forge.priorityClassName }}
+      priorityClassName: "{{ .Values.forge.priorityClassName}}"
+      {{- end }}
       serviceAccountName: flowforge
       automountServiceAccountToken: true 
       securityContext:

diff --git a/helm/flowforge/templates/file-storage.yml b/helm/flowforge/templates/file-storage.yml
@@ -49,6 +49,9 @@ spec:
         prometheus.io/path: "/metrics"
         {{- end  }}
     spec:
+      {{- if .Values.forge.priorityClassName }}
+      priorityClassName: "{{ .Values.forge.priorityClassName}}"
+      {{- end }}
       automountServiceAccountToken: false
       securityContext:
         {{- toYaml .Values.forge.fileStore.podSecurityContext | nindent 8 }}

diff --git a/helm/flowforge/values.schema.json b/helm/flowforge/values.schema.json
@@ -528,6 +528,9 @@
                                 }
                             }
                         },
+                        "priorityClassName": {
+                            "type": "string"
+                        },
                         "livenessProbe": {
                             "type": "object",
                             "properties": {

diff --git a/helm/flowforge/values.yaml b/helm/flowforge/values.yaml
@@ -127,6 +127,8 @@ forge:
 
   tolerations: []
 
+  priorityClassName: ""
+
   logPassthrough: false
   customHostname:
     enabled: false