@flowfuse/driver-kubernetes 2.21.3-e342621-202509150738.0 → 2.22.1-468ab35-202510010835.0

package/.github/workflows/release-publish.yml

@@ -13,6 +13,6 @@ jobs:
               with:
                   node-version: 18
             - run: npm ci
-            - uses: JS-DevTools/npm-publish@d9dc932de083f0e6de6a50f0d1097a7142c3751b # v4.0.0
+            - uses: JS-DevTools/npm-publish@7f8fe47b3bea1be0c3aec2b717c5ec1f3e03410b # v4.1.1
               with:
                   token: ${{ secrets.NPM_PUBLISH_TOKEN }}

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+#### 2.22.0: Release
+
+ - Bump JS-DevTools/npm-publish from 4.0.0 to 4.0.1 (#236)
+ - Increase http timeout for forge polling nr-launcher (#235)
+ - Bump JS-DevTools/npm-publish from 3.1.1 to 4.0.0 (#234)
+ - Bump tar-fs from 3.1.0 to 3.1.1 (#238) @app/dependabot
+ - Force 24 hour time out to be a string (#237) @hardillb
+ - Add team broker mqtt agent support (#232) @hardillb
+
 #### 2.21.2: Release
 
  - Bump actions/setup-node from 4.4.0 to 5.0.0 (#230)

package/kubernetes.js

@@ -202,6 +202,13 @@ const createDeployment = async (project, options) => {
         localPod.spec.containers[0].resources.limits.cpu = `${stack.cpu * 10}m`
     }
 
+    if (this._app.config.driver.options?.projectLabels) {
+        localPod.spec.labels = {
+            ...localPod.spec.labels,
+            ...this._app.config.driver.options.projectLabels
+        }
+    }
+
     const ha = await project.getSetting('ha')
     if (ha?.replicas > 1) {
         localDeployment.spec.replicas = ha.replicas
@@ -225,6 +232,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 +274,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 +326,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 +355,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
 }
@@ -521,7 +545,8 @@ const getStaticFileUrl = async (instance, filePath) => {
 }
 
 const createMQTTTopicAgent = async (broker) => {
-    this._app.log.info(`[k8s] Starting MQTT Schema agent ${broker.hashid} for ${broker.Team.hashid}`)
+    const agent = broker.constructor.name === 'TeamBrokerAgent'
+    this._app.log.info(`[k8s] Starting MQTT Schema agent ${agent ? 'team-broker' : broker.hashid} for ${broker.Team.hashid}`)
     const localPod = JSON.parse(JSON.stringify(mqttSchemaAgentPodTemplate))
     const localService = JSON.parse(JSON.stringify(mqttSchemaAgentServiceTemplate))
 
@@ -530,25 +555,39 @@ const createMQTTTopicAgent = async (broker) => {
     const { token } = await broker.refreshAuthTokens()
     localPod.spec.containers[0].env.push({ name: 'FORGE_TEAM_TOKEN', value: token })
     localPod.spec.containers[0].env.push({ name: 'FORGE_URL', value: this._app.config.api_url })
-    localPod.spec.containers[0].env.push({ name: 'FORGE_BROKER_ID', value: broker.hashid })
+    localPod.spec.containers[0].env.push({ name: 'FORGE_BROKER_ID', value: agent ? 'team-broker' : broker.hashid })
     localPod.spec.containers[0].env.push({ name: 'FORGE_TEAM_ID', value: broker.Team.hashid })
+    if (agent) {
+        // env vars must be strings not numbers
+        localPod.spec.containers[0].env.push({ name: 'FORGE_TIMEOUT', value: '24' })
+    }
 
     if (this._app.config.driver.options.projectSelector) {
         localPod.spec.nodeSelector = this._app.config.driver.options.projectSelector
     }
 
-    localPod.metadata.name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`
+    localPod.metadata.name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`
     localPod.metadata.labels = {
         name: `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`,
         team: broker.Team.hashid,
-        broker: broker.hashid
+        broker: agent ? 'team-broker' : broker.hashid
     }
-    localService.metadata.name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`
+    localService.metadata.name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`
     localService.metadata.labels = {
         team: broker.Team.hashid,
-        broker: broker.hashid
+        broker: agent ? 'team-broker' : broker.hashid
+    }
+    if (this._app.config.driver.options?.projectLabels) {
+        localPod.spec.labels = {
+            ...localPod.spec.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()}-${broker.hashid.toLowerCase()}`
+    localService.spec.selector.name = `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`
 
     // TODO remove registry entry
     localPod.spec.containers[0].image = this._app.config.driver.options?.mqttSchemaContainer || `${this._app.config.driver.options.registry ? this._app.config.driver.options.registry + '/' : ''}flowfuse/mqtt-schema-agent`
@@ -560,7 +599,7 @@ const createMQTTTopicAgent = async (broker) => {
         await this._k8sApi.createNamespacedPod({ namespace, body: localPod })
         await this._k8sApi.createNamespacedService({ namespace, body: localService })
     } catch (err) {
-        this._app.log.error(`[k8s] Problem creating MQTT Agent ${broker.hashid} in ${namespace} - ${err.toString()} ${err.stack}`)
+        this._app.log.error(`[k8s] Problem creating MQTT Agent ${agent ? 'team-broker' : broker.hashid} in ${namespace} - ${err.toString()} ${err.stack}`)
     }
 }
 
@@ -699,15 +738,16 @@ module.exports = {
 
                 // Check restarting MQTT-Schema-Agent
                 brokers.forEach(async (broker) => {
+                    const agent = broker.constructor.name === 'TeamBrokerAgent'
                     if (broker.Team && broker.state === 'running') {
                         try {
-                            this._app.log.info(`[k8s] Testing MQTT Agent ${broker.hashid} in ${namespace} pod exists`)
-                            this._app.log.debug(`mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`)
-                            await this._k8sApi.readNamespacedPodStatus({ name: `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`, namespace })
-                            this._app.log.info(`[k8s] MQTT Agent pod ${broker.hashid} in ${namespace} found`)
+                            this._app.log.info(`[k8s] Testing MQTT Agent ${agent ? 'team-broker' : broker.hashid} in ${namespace} pod exists`)
+                            this._app.log.debug(`mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`)
+                            await this._k8sApi.readNamespacedPodStatus({ name: `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`, namespace })
+                            this._app.log.info(`[k8s] MQTT Agent pod ${agent ? 'team-broker' : broker.hashid} in ${namespace} found`)
                         } catch (err) {
-                            this._app.log.debug(`[k8s] MQTT Agent ${broker.hashid} - failed ${err.toString()}`)
-                            this._app.log.debug(`[k8s] MQTT Agent ${broker.hashid} - recreating pod`)
+                            this._app.log.debug(`[k8s] MQTT Agent ${agent ? 'team-broker' : broker.hashid} - failed ${err.toString()}`)
+                            this._app.log.debug(`[k8s] MQTT Agent ${agent ? 'team-broker' : broker.hashid} - recreating pod`)
                             await createMQTTTopicAgent(broker)
                         }
                     }
@@ -1142,7 +1182,7 @@ module.exports = {
             const addresses = await getEndpoints(project)
             const logRequests = []
             for (const address in addresses) {
-                logRequests.push(got.get(`http://${addresses[address]}:2880/flowforge/logs`, { timeout: { request: 1000 } }).json())
+                logRequests.push(got.get(`http://${addresses[address]}:2880/flowforge/logs`, { timeout: { request: 2000 } }).json())
             }
             const results = await Promise.all(logRequests)
             const combinedResults = results.flat(1)
@@ -1150,7 +1190,7 @@ module.exports = {
             return combinedResults
         } else {
             const prefix = project.safeName.match(/^[0-9]/) ? 'srv-' : ''
-            const result = await got.get(`http://${prefix}${project.safeName}.${this._namespace}:2880/flowforge/logs`, { timeout: { request: 1000 } }).json()
+            const result = await got.get(`http://${prefix}${project.safeName}.${this._namespace}:2880/flowforge/logs`, { timeout: { request: 2000 } }).json()
             return result
         }
     },
@@ -1280,31 +1320,34 @@ module.exports = {
         createMQTTTopicAgent(broker)
     },
     stopBrokerAgent: async (broker) => {
+        const agent = broker.constructor.name === 'TeamBrokerAgent'
         try {
-            await this._k8sApi.deleteNamespacedService({ name: `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`, namespace: this._namespace })
-            await this._k8sApi.deleteNamespacedPod({ name: `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}`, namespace: this._namespace })
+            await this._k8sApi.deleteNamespacedService({ name: `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`, namespace: this._namespace })
+            await this._k8sApi.deleteNamespacedPod({ name: `mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}`, namespace: this._namespace })
         } catch (err) {
-            this._app.log.error(`[k8s] Error deleting MQTT Agent ${broker.hashid}: ${err.toString()} ${err.code}`)
+            this._app.log.error(`[k8s] Error deleting MQTT Agent ${agent ? 'team-broker' : broker.hashid}: ${err.toString()} ${err.code}`)
         }
     },
     getBrokerAgentState: async (broker) => {
+        const agent = broker.constructor.name === 'TeamBrokerAgent'
         try {
-            const status = await got.get(`http://mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}.${this._namespace}:3500/api/v1/status`, { timeout: { request: 1000 } }).json()
+            const status = await got.get(`http://mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}.${this._namespace}:3500/api/v1/status`, { timeout: { request: 1000 } }).json()
             return status
         } catch (err) {
             return { error: 'error_getting_status', message: err.toString() }
         }
     },
     sendBrokerAgentCommand: async (broker, command) => {
+        const agent = broker.constructor.name === 'TeamBrokerAgent'
         if (command === 'start' || command === 'restart') {
             try {
-                await got.post(`http://mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}.${this._namespace}:3500/api/v1/commands/start`, { timeout: { request: 1000 } })
+                await got.post(`http://mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}.${this._namespace}:3500/api/v1/commands/start`, { timeout: { request: 1000 } })
             } catch (err) {
 
             }
         } else if (command === 'stop') {
             try {
-                await got.post(`http://mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${broker.hashid.toLowerCase()}.${this._namespace}:3500/api/v1/commands/stop`, { timeout: { request: 1000 } })
+                await got.post(`http://mqtt-schema-agent-${broker.Team.hashid.toLowerCase()}-${agent ? 'team-broker' : broker.hashid.toLowerCase()}.${this._namespace}:3500/api/v1/commands/stop`, { timeout: { request: 1000 } })
             } catch (err) {
 
             }
@@ -1333,7 +1376,7 @@ module.exports = {
             }
         } else {
             const prefix = project.safeName.match(/^[0-9]/) ? 'srv-' : ''
-            const result = await got.get(`http://${prefix}${project.safeName}.${this._namespace}:2880/flowforge/resources`, { timeout: { request: 1000 } }).json()
+            const result = await got.get(`http://${prefix}${project.safeName}.${this._namespace}:2880/flowforge/resources`, { timeout: { request: 2000 } }).json()
             if (Array.isArray(result)) {
                 return {
                     meta: {},

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-kubernetes",
-    "version": "2.21.3-e342621-202509150738.0",
+    "version": "2.22.1-468ab35-202510010835.0",
     "description": "Kubernetes driver for FlowFuse",
     "main": "kubernetes.js",
     "scripts": {