@flowfuse/driver-kubernetes 2.22.1-d5adaf7-202509290744.0 → 2.22.2-212a69c-202510161205.0

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+#### 2.22.1: Release
+
+ - Bump JS-DevTools/npm-publish from 4.0.1 to 4.1.1 (#240)
+ - feat: add possibility to apply custom labels on project-related resources (#241) @ppawlowski
+
 #### 2.22.0: Release
 
  - Bump JS-DevTools/npm-publish from 4.0.0 to 4.0.1 (#236)

package/README.md

@@ -15,6 +15,9 @@ driver:
     projectSelector:
       role: projects
     projectNamespace: flowforge
+    projectLabels:
+      environment: production
+      team: alpha
     cloudProvider: aws
     privateCA: ff-ca-certs
     certManagerIssuer: lets-encrypt
@@ -40,6 +43,11 @@ driver:
 - `projectNamespace` the namespace Project pods should run in
 - `projectSelector` a list of labels that should be used to select which nodes Project Pods
 should run on
+- `projectLabels` a list of custom labels that should be applied to all resources created for Projects (Pods, Services, Ingresses, PVCs)
+- `projectProbes` optional configuration for liveness, readiness and startup probes for project containers
+- `projectProbes.livenessProbe` custom liveness probe configuration (default not set)
+- `projectProbes.readinessProbe` custom readiness probe configuration (default not set)
+- `projectProbes.startupProbe` custom startup probe configuration (default not set)
 - `cloudProvider` normally not set, but can be `aws` This triggers the adding of
 AWS EKS specific annotation for ALB Ingress. or `openshift` to allow running on OpenShift (Enterprise license only)
 - `privateCA` name of ConfigMap holding PEM CA Cert Bundle (file name `certs.pem`) Optional

package/kubernetes.js

@@ -202,6 +202,27 @@ const createDeployment = async (project, options) => {
         localPod.spec.containers[0].resources.limits.cpu = `${stack.cpu * 10}m`
     }
 
+    if (this._app.config.driver.options?.projectLabels) {
+        localPod.metadata.labels = {
+            ...localPod.metadata.labels,
+            ...this._app.config.driver.options.projectLabels
+        }
+        localDeployment.metadata.labels = {
+            ...localDeployment.metadata.labels,
+            ...this._app.config.driver.options.projectLabels
+        }
+    }
+
+    if (this._app.config.driver.options?.projectProbes?.livenessProbe) {
+        localPod.spec.containers[0].livenessProbe = this._app.config.driver.options.projectProbes.livenessProbe
+    }
+    if (this._app.config.driver.options?.projectProbes?.readinessProbe) {
+        localPod.spec.containers[0].readinessProbe = this._app.config.driver.options.projectProbes.readinessProbe
+    }
+    if (this._app.config.driver.options?.projectProbes?.startupProbe) {
+        localPod.spec.containers[0].startupProbe = this._app.config.driver.options.projectProbes.startupProbe
+    }
+
     const ha = await project.getSetting('ha')
     if (ha?.replicas > 1) {
         localDeployment.spec.replicas = ha.replicas
@@ -225,6 +246,9 @@ const createService = async (project, options) => {
         throw new Error('Service type must be either NodePort or ClusterIP')
     }
     localService.spec.type = serviceType
+    if (this._app.config.driver.options?.projectLabels) {
+        localService.metadata.labels = this._app.config.driver.options.projectLabels
+    }
     return localService
 }
 
@@ -264,6 +288,10 @@ const createIngress = async (project, options) => {
         localIngress.metadata.annotations[key] = mustache(localIngress.metadata.annotations[key], exposedData)
     })
 
+    if (this._app.config.driver.options?.projectLabels) {
+        localIngress.metadata.labels = this._app.config.driver.options.projectLabels
+    }
+
     localIngress.metadata.name = project.safeName
     localIngress.spec.rules[0].host = url.host
     localIngress.spec.rules[0].http.paths[0].backend.service.name = `${prefix}${project.safeName}`
@@ -312,6 +340,10 @@ const createCustomIngress = async (project, hostname, options) => {
         customIngress.spec.ingressClassName = `${this._customHostname.ingressClass}`
     }
 
+    if (this._app.config.driver.options?.projectLabels) {
+        customIngress.metadata.labels = this._app.config.driver.options.projectLabels
+    }
+
     return customIngress
 }
 
@@ -337,6 +369,12 @@ const createPersistentVolumeClaim = async (project, options) => {
         'ff-project-id': project.id,
         'ff-project-name': project.safeName
     }
+    if (this._app.config.driver.options?.projectLabels) {
+        pvc.metadata.labels = {
+            ...pvc.metadata.labels,
+            ...this._app.config.driver.options.projectLabels
+        }
+    }
     console.log(`PVC: ${JSON.stringify(pvc, null, 2)}`)
     return pvc
 }
@@ -553,6 +591,16 @@ const createMQTTTopicAgent = async (broker) => {
         team: broker.Team.hashid,
         broker: agent ? 'team-broker' : broker.hashid
     }
+    if (this._app.config.driver.options?.projectLabels) {
+        localPod.metadata.labels = {
+            ...localPod.metadata.labels,
+            ...this._app.config.driver.options.projectLabels
+        }
+        localService.metadata.labels = {
+            ...localService.metadata.labels,
+            ...this._app.config.driver.options.projectLabels
+        }
+    }
     localService.spec.selector.name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`
 
     // TODO remove registry entry
@@ -739,8 +787,8 @@ module.exports = {
                     },
                     container: {
                         label: 'Container Location',
-                        // taken from https://stackoverflow.com/a/62964157
-                        validate: '^(([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])(:[0-9]+\\/)?(?:[0-9a-z-]+[/@])(?:([0-9a-z-]+))[/@]?(?:([0-9a-z-]+))?(?::[a-z0-9\\.-]+)?$',
+                        // taken from https://stackoverflow.com/a/74073589
+                        validate: '^((?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?/)?[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?)(?::([\\w][\\w.-]{0,127}))?(?:@([A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}))?$',
                         invalidMessage: 'Invalid value - must be a Docker image',
                         description: 'Container image location, can include a tag'
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-kubernetes",
-    "version": "2.22.1-d5adaf7-202509290744.0",
+    "version": "2.22.2-212a69c-202510161205.0",
     "description": "Kubernetes driver for FlowFuse",
     "main": "kubernetes.js",
     "scripts": {