@flowfuse/driver-kubernetes 2.22.2-6911c7c-202510201047.0 → 2.22.2-765ff0f-202510230857.0

package/kubernetes.js

@@ -601,7 +601,9 @@ const createProject = async (project, options) => {
     project.state = 'running'
     await project.save()
 
-    this._projects[project.id].state = 'starting'
+    const cachedProject = await this._projects.get(project.id)
+    cachedProject.state = 'starting'
+    await this._projects.set(project.id, cachedProject)
 }
 
 const getEndpoints = async (project) => {
@@ -697,7 +699,7 @@ module.exports = {
             throw Error('Failed to load Kubernetes node client', { cause: err })
         }
         this._app = app
-        this._projects = {}
+        this._projects = app.caches.getCache('driver-k8s-projects') // {}
         this._options = options
 
         this._namespace = this._app.config.driver.options?.projectNamespace || 'flowforge'
@@ -740,22 +742,25 @@ module.exports = {
                 'TeamId'
             ]
         })
-        projects.forEach(async (project) => {
-            if (this._projects[project.id] === undefined) {
-                this._projects[project.id] = {
+        for (const project of projects) {
+            if (await this._projects.get(project.id) === undefined) {
+                await this._projects.set(project.id, {
                     state: 'unknown'
-                }
+                })
             }
-        })
+        }
 
         this._initialCheckTimeout = setTimeout(async () => {
             this._app.log.debug('[k8s] Restarting projects')
             const namespace = this._namespace
-            projects.forEach(async (project) => {
+            for (const project of projects) {
                 try {
                     if (project.state === 'suspended') {
                         // Do not restart suspended projects
-                        return
+                        const cachedProject = await this._projects.get(project.id)
+                        cachedProject.state = 'suspened'
+                        await this._projects.set(project.id, cachedProject)
+                        continue
                     }
 
                     // need to upgrade bare pods to deployments
@@ -809,7 +814,7 @@ module.exports = {
                 } catch (err) {
                     this._app.log.error(`[k8s] Instance ${project.id} - error resuming project: ${err.stack}`)
                 }
-            })
+            }
 
             // get list of all MQTTBrokers
             if (this._app.db.models.BrokerCredentials) {
@@ -818,7 +823,7 @@ module.exports = {
                 })
 
                 // Check restarting MQTT-Schema-Agent
-                brokers.forEach(async (broker) => {
+                for (const broker of brokers) {
                     const agent = broker.constructor.name === 'TeamBrokerAgent'
                     if (broker.Team && broker.state === 'running') {
                         try {
@@ -832,9 +837,9 @@ module.exports = {
                             await createMQTTTopicAgent(broker)
                         }
                     }
-                })
+                }
             }
-        }, 1000)
+        }, Math.floor(1000 + (Math.random() * 5))) // space this out so if 2 instances running they shouldn't run at the same time
 
         // need to work out what we can expose for K8s
         return {
@@ -869,9 +874,9 @@ module.exports = {
      * @return {forge.containers.Project}
      */
     start: async (project) => {
-        this._projects[project.id] = {
+        await this._projects.set(project.id, {
             state: 'starting'
-        }
+        })
 
         // Rather than await this promise, we return it. That allows the wrapper
         // to respond to the create request much quicker and the create can happen
@@ -891,7 +896,9 @@ module.exports = {
      */
     stop: async (project) => {
         // Stop the project
-        this._projects[project.id].state = 'stopping'
+        const cachedProject = await this._projects.get(project.id)
+        cachedProject.state = 'stopping'
+        await this._projects.set(project.id, cachedProject)
 
         try {
             await this._k8sNetApi.deleteNamespacedIngress({ name: project.safeName, namespace: this._namespace })
@@ -1006,7 +1013,8 @@ module.exports = {
         //     }
         // }
 
-        this._projects[project.id].state = 'suspended'
+        cachedProject.state = 'suspended'
+        await this._projects.set(project.id, cachedProject)
         return new Promise((resolve, reject) => {
             let counter = 0
             const pollInterval = setInterval(async () => {
@@ -1108,7 +1116,7 @@ module.exports = {
                 // console.log(err)
             }
         }
-        delete this._projects[project.id]
+        await this._projects.del(project.id)
     },
     /**
      * Retrieves details of a project's container
@@ -1116,14 +1124,15 @@ module.exports = {
      * @return {Object}
      */
     details: async (project) => {
-        if (this._projects[project.id] === undefined) {
+        const cachedProject = await this._projects.get(project.id)
+        if (cachedProject === undefined) {
             return { state: 'unknown' }
         }
-        if (this._projects[project.id].state === 'suspended') {
+        if (cachedProject.state === 'suspended') {
             // We should only poll the launcher if we think it is running.
             // Otherwise, return our cached state
             return {
-                state: this._projects[project.id].state
+                state: cachedProject.state
             }
         }
         const prefix = project.safeName.match(/^[0-9]/) ? 'srv-' : ''
@@ -1137,7 +1146,8 @@ module.exports = {
                 details = await this._k8sAppApi.readNamespacedDeployment({ name: project.safeName, namespace: this._namespace })
                 if (details.status?.conditions[0].status === 'False') {
                     // return "starting" status until pod it running
-                    this._projects[project.id].state = 'starting'
+                    cachedProject.state = 'starting'
+                    await this._projects.set(project.id, cachedProject)
                     return {
                         id: project.id,
                         state: 'starting',
@@ -1151,7 +1161,8 @@ module.exports = {
                     const infoURL = `http://${prefix}${project.safeName}.${this._namespace}:2880/flowforge/info`
                     try {
                         const info = JSON.parse((await got.get(infoURL, { timeout: { request: 1000 } })).body)
-                        this._projects[project.id].state = info.state
+                        cachedProject.state = info.state
+                        await this._projects.set(project.id, cachedProject)
                         return info
                     } catch (err) {
                         this._app.log.debug(`error getting state from instance ${project.id}: ${err}`)
@@ -1173,7 +1184,8 @@ module.exports = {
                 details = await this._k8sApi.readNamespacedPodStatus({ name: project.safeName, namespace: this._namespace })
                 if (details.status?.phase === 'Pending') {
                     // return "starting" status until pod it running
-                    this._projects[project.id].state = 'starting'
+                    cachedProject.state = 'starting'
+                    this._projects.set(project.id, cachedProject)
                     return {
                         id: project.id,
                         state: 'starting',
@@ -1184,7 +1196,8 @@ module.exports = {
                     const infoURL = `http://${prefix}${project.safeName}.${this._namespace}:2880/flowforge/info`
                     try {
                         const info = JSON.parse((await got.get(infoURL, { timeout: { request: 1000 } })).body)
-                        this._projects[project.id].state = info.state
+                        cachedProject.state = info.state
+                        await this._projects.set(project.id, cachedProject)
                         return info
                     } catch (err) {
                         this._app.log.debug(`error getting state from instance ${project.id}: ${err}`)
@@ -1234,7 +1247,8 @@ module.exports = {
      * @return {forge.Status}
      */
     startFlows: async (project) => {
-        if (this._projects[project.id] === undefined) {
+        const cachedProject = await this._projects.get(project.id)
+        if (cachedProject === undefined) {
             return { state: 'unknown' }
         }
         const endpoints = await getEndpoints(project)
@@ -1256,7 +1270,8 @@ module.exports = {
      * @return {forge.Status}
      */
     stopFlows: async (project) => {
-        if (this._projects[project.id] === undefined) {
+        const cachedProject = await this._projects.get(project.id)
+        if (cachedProject === undefined) {
             return { state: 'unknown' }
         }
         const endpoints = await getEndpoints(project)
@@ -1278,7 +1293,8 @@ module.exports = {
      * @return {array} logs
      */
     logs: async (project) => {
-        if (this._projects[project.id] === undefined) {
+        const cachedProject = await this._projects.get(project.id)
+        if (cachedProject === undefined) {
             return { state: 'unknown' }
         }
         if (await project.getSetting('ha')) {
@@ -1304,7 +1320,8 @@ module.exports = {
      * @return {forge.Status}
      */
     restartFlows: async (project) => {
-        if (this._projects[project.id] === undefined) {
+        const cachedProject = await this._projects.get(project.id)
+        if (cachedProject === undefined) {
             return { state: 'unknown' }
         }
         const endpoints = await getEndpoints(project)
@@ -1459,7 +1476,8 @@ module.exports = {
 
     // Resouces api
     resources: async (project) => {
-        if (this._projects[project.id] === undefined) {
+        const cachedProject = await this._projects.get(project.id)
+        if (cachedProject === undefined) {
             return { state: 'unknown' }
         }
         if (await project.getSetting('ha')) {
@@ -1492,7 +1510,8 @@ module.exports = {
         }
     },
     resourcesStream: async (project, socket) => {
-        if (this._projects[project.id] === undefined) {
+        const cachedProject = await this._projects.get(project.id)
+        if (cachedProject === undefined) {
             throw new Error('Cannot get instance resources')
         }
         if (await project.getSetting('ha')) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-kubernetes",
-    "version": "2.22.2-6911c7c-202510201047.0",
+    "version": "2.22.2-765ff0f-202510230857.0",
     "description": "Kubernetes driver for FlowFuse",
     "main": "kubernetes.js",
     "scripts": {