@flowfuse/driver-kubernetes 2.28.1-e0816fb-202603180927.0 → 2.28.1

package/.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
     uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.52.0'
     with:
       node: '[
-              {"version": "18", "tests": false, "lint": true},
+              {"version": "24", "tests": false, "lint": true},
             ]'
 
   publish:
@@ -36,10 +36,12 @@ jobs:
     steps:
       - name: Generate a token
         id: generate_token
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
         with:
           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/.github/workflows/release-publish.yml

@@ -11,7 +11,7 @@ jobs:
             - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
               with:
-                  node-version: 18
+                  node-version: 24
             - run: npm ci
             - uses: JS-DevTools/npm-publish@0fd2f4369c5d6bcfcde6091a7c527d810b9b5c3f # v4.1.5
               with:

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+#### 2.28.1: Release
+
+ - Bump actions/create-github-app-token from 2.2.1 to 3.0.0 (#321)
+ - ci: Use NodeJS v24 to build package (#334) @ppawlowski
+ - ci: Use NodeJS v24 as a default GitHub Actions runtime (#333) @ppawlowski
+ - Bump flatted from 3.3.3 to 3.4.2 (#330) @app/dependabot
+ - Fix order of delay and times in wrap function (#329) @hardillb
+ - fix: `createNamespacedPersistentVolumeClaim` method name (#328) @ppawlowski
+ - Wrapped standard K8s APIs with retry logix (#325) @hardillb
+ - ci: Fix repository parameter for token (#327) @ppawlowski
+ - ci: fix token permissions scope (#326) @ppawlowski
+ - fix: Attempt to remove a custom ingress only if it is configured (#323) @ppawlowski
+ - ci: replace `tibdex/github-app-token` with `actions/create-github-app-token` (#320) @ppawlowski
+ - ci: add concurrency to publish workflow (#319) @ppawlowski
+
 #### 2.28.0: Release
 
  - Bump actions/setup-node from 6.2.0 to 6.3.0 (#314)

package/kubernetes.js

@@ -732,6 +732,25 @@ const waitForInstanceRunning = async (endpoint) => {
     })
 }
 
+// functions to wrap k8s api functions in retry logic
+const retry = (driver, api, func, args, delay, times) => {
+    return func.apply(api, args).catch(err => {
+        driver._app.log.error(`[k8s] API call to ${func.name} failed. attempt=${driver._k8sRetries - times + 1}/${driver._k8sRetries + 1} statusCode=${err.response?.statusCode || 'N/A'}  ${err.toString()}`)
+        if (times > 0 && err.response && err.response.statusCode === 429) {
+            return new Promise(resolve => {
+                setTimeout(() => { resolve(retry(driver, api, func, args, delay * 2, times - 1)) }, delay)
+            })
+        }
+        return Promise.reject(err)
+    })
+}
+const wrapClient = (api, funcs, driver) => {
+    for (const f of funcs) {
+        const originalFunc = api[f.name]
+        api[f.name] = function () { return retry(driver, api, originalFunc, arguments, driver._k8sDelay, driver._k8sRetries) }
+    }
+}
+
 module.exports = {
     /**
     * Initialises this driver
@@ -780,6 +799,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.createNamespacedPersistentVolumeClaim,
+            this._k8sApi.createNamespacedService,
+            this._k8sApi.createNamespacedPod,
+            this._k8sApi.deleteNamespacedPod,
+            this._k8sApi.deleteNamespacedSecret,
+            this._k8sApi.deleteNamespacedService,
+            this._k8sApi.deleteNamespacedPersistentVolumeClaim
+        ], this)
+        wrapClient(this._k8sAppApi, [
+            this._k8sAppApi.createNamespacedDeployment,
+            this._k8sAppApi.deleteNamespacedDeployment
+        ], this)
+        wrapClient(this._k8sNetApi, [
+            this._k8sNetApi.createNamespacedIngress,
+            this._k8sNetApi.deleteNamespacedIngress
+        ], this)
+
         // Get a list of all projects - with the absolute minimum of fields returned
         const projects = await app.db.models.Project.findAll({
             attributes: [

package/package.json

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