@flowfuse/driver-kubernetes 2.24.6-a5e47f0-202512150752.0 → 2.25.1-334957a-202512301450.0

package/.github/workflows/publish.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.44.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml@v0.45.0'
     with:
       node: '[
               {"version": "18", "tests": false, "lint": true},
@@ -19,7 +19,7 @@ jobs:
   publish:
     needs: build
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.44.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.45.0'
     with:
       package_name: driver-k8s
       publish_package: true

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+#### 2.25.0: Release
+
+ - Bump flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml (#269)
+ - Bump flowfuse/github-actions-workflows/.github/workflows/build_node_package.yml (#270)
+
 #### 2.24.5: Release
 
  - Bump actions/checkout from 6.0.0 to 6.0.1 (#267)

package/README.md

@@ -67,6 +67,7 @@ AWS EKS specific annotation for ALB Ingress. or `openshift` to allow running on
 - `podSecurityContext` Settings linked to the [security context of the pod](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
 - `containerSecurityContext` Settings linked to the [security context of the container](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
 - `service.type` Type of service to create for the editor (allowed `ClusterIP` or `NodePort`, default `ClusterIP`)
+- `schedulerName` name of the custom Kubernetes scheduler to use for Project Pods and MQTT agent Pods (default not set, uses default Kubernetes scheduler)
 
 Expects to pick up K8s credentials from the environment
 

package/eslint.config.mjs

@@ -0,0 +1,54 @@
+import globals from 'globals'
+import js from '@eslint/js'
+import neostandard, { resolveIgnoresFromGitignore } from 'neostandard'
+import stylistic from '@stylistic/eslint-plugin'
+import noOnlyTests from 'eslint-plugin-no-only-tests'
+
+export default [
+    {
+        files: ['**/*.js'],
+        languageOptions: {
+            globals: {
+                ...globals.browser
+            },
+            sourceType: 'script'
+        }
+    },
+    {
+        files: ['test/**/*.js'],
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+                ...globals.mocha
+            },
+            sourceType: 'script'
+        }
+    },
+    {
+        ignores: [
+            ...resolveIgnoresFromGitignore()
+        ]
+    },
+    js.configs.recommended,
+    ...neostandard(),
+    {
+        plugins: {
+            '@stylistic': stylistic,
+            'no-only-tests': noOnlyTests
+        },
+        rules: {
+            // built-in
+            'object-shorthand': ['error'],
+            'no-console': ['error', { allow: ['debug', 'info', 'warn', 'error'] }],
+
+            // plugin:stylistic
+            '@stylistic/indent': ['warn', 4], // https://eslint.style/rules/indent#options
+            '@stylistic/spaced-comment': ['error', 'always'], // https://eslint.style/rules/spaced-comment
+            '@stylistic/no-multi-spaces': 'error', // https://eslint.style/rules/no-multi-spaces#no-multi-spaces
+            '@stylistic/comma-dangle': ['error', 'never'], // https://eslint.style/rules/comma-dangle#comma-dangle
+
+            // plugin:no-only-tests
+            'no-only-tests/no-only-tests': 'error'
+        }
+    }
+]

package/kubernetes.js

@@ -80,6 +80,10 @@ const createDeployment = async (project, options) => {
     localPod.metadata.labels.name = project.safeName
     localPod.spec.serviceAccount = process.env.EDITOR_SERVICE_ACCOUNT
 
+    if (this._schedulerName) {
+        localPod.spec.schedulerName = this._schedulerName
+    }
+
     if (stack.container) {
         localPod.spec.containers[0].image = stack.container
     } else {
@@ -441,7 +445,7 @@ const createPersistentVolumeClaim = async (project, options) => {
             ...this._app.config.driver.options.projectLabels
         }
     }
-    console.log(`PVC: ${JSON.stringify(pvc, null, 2)}`)
+    console.error(`PVC: ${JSON.stringify(pvc, null, 2)}`)
     return pvc
 }
 
@@ -458,7 +462,7 @@ const createProject = async (project, options) => {
         try {
             await this._k8sApi.createNamespacedPersistentVolumeClaim({ namespace, body: localPVC })
         } catch (err) {
-            console.log(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 {
@@ -648,6 +652,10 @@ const createMQTTTopicAgent = async (broker) => {
         localPod.spec.nodeSelector = this._app.config.driver.options.projectSelector
     }
 
+    if (this._schedulerName) {
+        localPod.spec.schedulerName = this._schedulerName
+    }
+
     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()}`,
@@ -677,7 +685,7 @@ const createMQTTTopicAgent = async (broker) => {
     // console.log(JSON.stringify(localPod,null,2))
     // console.log(JSON.stringify(localService,null,2))
     try {
-        console.log(namespace, localPod.metadata.name)
+        console.debug(namespace, localPod.metadata.name)
         await this._k8sApi.createNamespacedPod({ namespace, body: localPod })
         await this._k8sApi.createNamespacedService({ namespace, body: localService })
     } catch (err) {
@@ -709,6 +717,7 @@ module.exports = {
         this._projectIngressAnnotations = this._app.config.driver.options?.projectIngressAnnotations
         this._logPassthrough = this._app.config.driver.options?.logPassthrough || false
         this._cloudProvider = this._app.config.driver.options?.cloudProvider
+        this._schedulerName = this._app.config.driver.options?.schedulerName
         if (this._app.config.driver.options?.customHostname?.enabled) {
             this._app.log.info('[k8s] Enabling Custom Hostname Support')
             this._customHostname = this._app.config.driver.options?.customHostname
@@ -1383,7 +1392,7 @@ module.exports = {
         try {
             return got.get(fileUrl, { timeout: { request: 1000 } }).json()
         } catch (err) {
-            console.log(err)
+            console.error(err)
             err.statusCode = err.response.statusCode
             throw err
         }

package/lib/aws-efs.js

@@ -1,9 +1,8 @@
-const { EFSClient, DescribeFileSystemsCommand, DescribeAccessPointsCommand } = require("@aws-sdk/client-efs")
+const { EFSClient, DescribeFileSystemsCommand, DescribeAccessPointsCommand } = require('@aws-sdk/client-efs')
 
 let client
 
 async function lookupStorageClass (tagName) {
-
     // console.log(`Looking for ${tagName}`)
 
     if (!client) {
@@ -16,14 +15,14 @@ async function lookupStorageClass (tagName) {
 
     const fileSystems = []
 
-    for (let i = 0; i<fsList.FileSystems.length; i++) {
+    for (let i = 0; i < fsList.FileSystems.length; i++) {
         let found = false
         let storageClass = ''
-        for (let j = 0; j<fsList.FileSystems[i].Tags.length; j++) {
+        for (let j = 0; j < fsList.FileSystems[i].Tags.length; j++) {
             const tag = fsList.FileSystems[i].Tags[j]
             if (tag.Key === tagName) {
                 found = true
-            } 
+            }
             if (tag.Key === 'storage-class-name') {
                 storageClass = tag.Value
             }
@@ -37,19 +36,18 @@ async function lookupStorageClass (tagName) {
             // console.log(apParams)
             const apListCommand = new DescribeAccessPointsCommand(apParams)
             const apList = await client.send(apListCommand)
-            // fileSystems[fsList.FileSystems[i].FileSystemId] 
+            // fileSystems[fsList.FileSystems[i].FileSystemId]
             fileSystems.push({
                 apCount: apList.AccessPoints.length,
                 storageClass
             })
-        } 
+        }
     }
-    fileSystems.sort((a,b) => a.apCount - b.apCount)
+    fileSystems.sort((a, b) => a.apCount - b.apCount)
 
     return fileSystems[0]?.storageClass
 }
 
-
 module.exports = {
     lookupStorageClass
 }

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@flowfuse/driver-kubernetes",
-    "version": "2.24.6-a5e47f0-202512150752.0",
+    "version": "2.25.1-334957a-202512301450.0",
     "description": "Kubernetes driver for FlowFuse",
     "main": "kubernetes.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "lint": "eslint -c .eslintrc \"*.js\"",
-        "lint:fix": "eslint -c .eslintrc \"*.js\" --fix"
+        "lint": "eslint -c eslint.config.mjs ",
+        "lint:fix": "eslint -c eslint.config.mjs --fix"
     },
     "repository": {
         "type": "git",
@@ -28,7 +28,10 @@
         "lodash": "^4.17.21"
     },
     "devDependencies": {
-        "eslint": "^8.25.0",
-        "eslint-config-standard": "^17.0.0"
+        "@eslint/js": "^9.39.2",
+        "eslint": "^9.39.2",
+        "eslint-plugin-no-only-tests": "^3.3.0",
+        "globals": "^16.5.0",
+        "neostandard": "^0.12.2"
     }
 }

package/.eslintrc

@@ -1,19 +0,0 @@
-{
-    "root": true,
-    "env": {
-        "browser": true,
-        "commonjs": true,
-        "es2021": true,
-        "mocha": true
-    },
-    "extends": [
-        "standard"
-    ],
-    "parserOptions": {
-        "ecmaVersion": 12
-    },
-    "rules": {
-        "indent": ["error", 4],
-        "object-shorthand": ["error"]
-    }
-}