@flowfuse/driver-kubernetes 2.28.0 → 2.28.1-13fe50a-202603191145.0

package/.github/workflows/publish.yml

@@ -8,6 +8,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.52.0'
@@ -32,10 +36,12 @@ jobs:
     steps:
       - name: Generate a token
         id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
-          app_id: ${{ secrets.GH_BOT_APP_ID }}
-          private_key: ${{ secrets.GH_BOT_APP_KEY }}
+          app-id: ${{ secrets.GH_BOT_APP_ID }}
+          private-key: ${{ secrets.GH_BOT_APP_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: helm
       - name: Trigger flowfuse container build
         uses: benc-uk/workflow-dispatch@7a027648b88c2413826b6ddd6c76114894dc5ec4 # v1.3.1
         with:

package/kubernetes.js

@@ -732,6 +732,24 @@ const waitForInstanceRunning = async (endpoint) => {
     })
 }
 
+// functions to wrap k8s api functions in retry logic
+const retry = (api, func, args, delay, times) => {
+    return func.apply(api, args).catch(err => {
+        if (times > 0 && err.response && err.response.statusCode === 429) {
+            return new Promise(resolve => {
+                setTimeout(() => { resolve(retry(api, func, args, delay * 2, times - 1)) }, delay)
+            })
+        }
+        return Promise.reject(err)
+    })
+}
+const wrapClient = (api, funcs) => {
+    for (const f of funcs) {
+        const originalFunc = api[f.name]
+        api[f.name] = function () { return retry(api, originalFunc, arguments, this._k8sRetries, this._k8sDelay) }
+    }
+}
+
 module.exports = {
     /**
     * Initialises this driver
@@ -780,6 +798,25 @@ module.exports = {
         this._k8sAppApi = kc.makeApiClient(k8s.AppsV1Api)
         this._k8sNetApi = kc.makeApiClient(k8s.NetworkingV1Api)
 
+        // add retry logic to these functions
+        wrapClient(this._k8sApi, [
+            this._k8sApi.createPersistentVolumeClaim,
+            this._k8sApi.createNamespacedService,
+            this._k8sApi.createNamespacedPod,
+            this._k8sApi.deleteNamespacedPod,
+            this._k8sApi.deleteNamespacedSecret,
+            this._k8sApi.deleteNamespacedService,
+            this._k8sApi.deleteNamespacedPersistentVolumeClaim
+        ])
+        wrapClient(this._k8sAppApi, [
+            this._k8sAppApi.createNamespacedDeployment,
+            this._k8sAppApi.deleteNamespacedDeployment
+        ])
+        wrapClient(this._k8sNetApi, [
+            this._k8sNetApi.createNamespacedIngress,
+            this._k8sNetApi.deleteNamespacedIngress
+        ])
+
         // Get a list of all projects - with the absolute minimum of fields returned
         const projects = await app.db.models.Project.findAll({
             attributes: [
@@ -974,17 +1011,20 @@ module.exports = {
         }
 
         if (this._customHostname?.enabled) {
-            try {
-                await this._k8sNetApi.deleteNamespacedIngress({ name: `${project.safeName}-custom`, namespace: this._namespace })
-            } catch (err) {
-                this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom ingress: ${err.toString()} ${err.stack}`)
-            }
-
-            if (this._customHostname?.certManagerIssuer) {
+            const customHostname = await project.getSetting('customHostname')
+            if (customHostname) {
                 try {
-                    await this._k8sApi.deleteNamespacedSecret({ name: `${project.safeName}-custom`, namespace: this._namespace })
+                    await this._k8sNetApi.deleteNamespacedIngress({ name: `${project.safeName}-custom`, namespace: this._namespace })
                 } catch (err) {
-                    this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom tls secret: ${err.toString()} ${err.stack}`)
+                    this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom ingress: ${err.toString()} ${err.stack}`)
+                }
+
+                if (this._customHostname?.certManagerIssuer) {
+                    try {
+                        await this._k8sApi.deleteNamespacedSecret({ name: `${project.safeName}-custom`, namespace: this._namespace })
+                    } catch (err) {
+                        this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom tls secret: ${err.toString()} ${err.stack}`)
+                    }
                 }
             }
         }
@@ -1116,16 +1156,19 @@ module.exports = {
             }
         }
         if (this._customHostname?.enabled) {
-            try {
-                await this._k8sNetApi.deleteNamespacedIngress({ name: `${project.safeName}-custom`, namespace: this._namespace })
-            } catch (err) {
-                this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom ingress: ${err.toString()}`)
-            }
-            if (this._customHostname?.certManagerIssuer || this._customHostname?.certManagerAnnotations) {
+            const customHostname = await project.getSetting('customHostname')
+            if (customHostname) {
                 try {
-                    await this._k8sApi.deleteNamespacedSecret({ name: `${project.safeName}-custom`, namespace: this._namespace })
+                    await this._k8sNetApi.deleteNamespacedIngress({ name: `${project.safeName}-custom`, namespace: this._namespace })
                 } catch (err) {
-                    this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom tls secret: ${err.toString()}`)
+                    this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom ingress: ${err.toString()}`)
+                }
+                if (this._customHostname?.certManagerIssuer || this._customHostname?.certManagerAnnotations) {
+                    try {
+                        await this._k8sApi.deleteNamespacedSecret({ name: `${project.safeName}-custom`, namespace: this._namespace })
+                    } catch (err) {
+                        this._app.log.error(`[k8s] Instance ${project.id} - error deleting custom tls secret: ${err.toString()}`)
+                    }
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-kubernetes",
-    "version": "2.28.0",
+    "version": "2.28.1-13fe50a-202603191145.0",
     "description": "Kubernetes driver for FlowFuse",
     "main": "kubernetes.js",
     "scripts": {