@flowfuse/driver-kubernetes 3.0.2 → 3.0.3-11ec222-202609111420.0

package/kubernetes.js

@@ -89,7 +89,7 @@ const createDeployment = async (project, options) => {
     }
 
     localPod.metadata.labels.app = project.id
-    localPod.metadata.labels.name = project.safeName
+    localPod.metadata.labels.name = project.safeName.slice(0, 63)
     localPod.spec.serviceAccount = process.env.EDITOR_SERVICE_ACCOUNT
 
     if (this._schedulerName) {
@@ -465,7 +465,7 @@ const createPersistentVolumeClaim = async (project, options) => {
             pvc.metadata.name = name
             pvc.metadata.labels = {
                 'ff-project-id': project.id,
-                'ff-project-name': project.safeName
+                'ff-project-name': project.safeName.slice(0, 63) // max label length is 64 chars
             }
             if (this._app.config.driver.options?.projectLabels) {
                 pvc.metadata.labels = {
@@ -473,7 +473,7 @@ const createPersistentVolumeClaim = async (project, options) => {
                     ...this._app.config.driver.options.projectLabels
                 }
             }
-            console.error(`PVC: ${JSON.stringify(pvc, null, 2)}`)
+            // console.error(`PVC: ${JSON.stringify(pvc, null, 2)}`)
             return pvc
         } else {
             throw err
@@ -495,7 +495,7 @@ const createProject = async (project, options) => {
             try {
                 await this._k8sApi.createNamespacedPersistentVolumeClaim({ namespace, body: localPVC })
             } catch (err) {
-                console.error(JSON.stringify(err))
+                // console.error(JSON.stringify(err))
                 if (err.code === 409) {
                     this._app.log.warn(`[k8s] PVC for instance ${project.id} already exists, proceeding...`)
                 } else {

package/lib/aws-efs.js

@@ -3,9 +3,52 @@ const retry = require('async-retry')
 
 let client
 
+let inflight
+let lastTime = 0
+const cacheTime = 30 * 1000 // 30 seconds
+
 async function lookupStorageClass (tagName) {
     // console.log(`Looking for ${tagName}`)
 
+    let fileSystems
+    if (inflight && (Date.now() - lastTime) < cacheTime) {
+        // Share the in-flight lookup with any caller that arrives while it is still
+        // running. A burst of instance creations would otherwise each make their own
+        // set of AWS calls, which is what triggers the ThrottlingException in #401
+        fileSystems = await inflight
+    } else {
+        // Start the cache window now rather than on completion, so callers arriving
+        // during the lookup share it instead of kicking off a second one
+        lastTime = Date.now()
+        inflight = doLookupStorageClass(tagName)
+
+        try {
+            fileSystems = await inflight
+        } catch (err) {
+            // Don't cache a failure - let the next caller try again
+            inflight = undefined
+            lastTime = 0
+            throw err
+        }
+    }
+
+    if (fileSystems.length === 0) {
+        return undefined
+    }
+
+    // Account for the access point this caller is about to create. Without this a
+    // burst of instances served from one cached read would all land on whichever
+    // filesystem was least loaded when the counts were taken, rather than being
+    // spread across them. The count is an estimate - it assumes the caller goes on
+    // to create the access point - and is corrected by the next refresh
+    const selected = fileSystems[0]
+    selected.apCount++
+    fileSystems.sort((a, b) => a.apCount - b.apCount)
+
+    return selected.storageClass
+}
+
+async function doLookupStorageClass (tagName) {
     if (!client) {
         client = new EFSClient()
     }
@@ -75,7 +118,7 @@ async function lookupStorageClass (tagName) {
     }
     fileSystems.sort((a, b) => a.apCount - b.apCount)
 
-    return fileSystems[0]?.storageClass
+    return fileSystems
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-kubernetes",
-    "version": "3.0.2",
+    "version": "3.0.3-11ec222-202609111420.0",
     "description": "Kubernetes driver for FlowFuse",
     "main": "kubernetes.js",
     "scripts": {