diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index f8b3602..dfc507c 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -33,7 +33,7 @@ "v-page": "^2.0.10", "v-tooltip": "^2.1.3", "vee-validate": "2.0.9", - "vue": "^2.6.14", + "vue": "^2.7.16", "vue-book": "0.1.0-alpha.9", "vue-bulma-expanding": "0.0.1", "vue-chartjs": "^3.5.1", @@ -27634,7 +27634,7 @@ "dev": true, "requires": { "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", + "follow-redirects": "^1.16.0", "requires-port": "^1.0.0" } }, diff --git a/dashboard/package.json b/dashboard/package.json index 888ef71..8b10b9e 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -38,7 +38,7 @@ "v-page": "^2.0.10", "v-tooltip": "^2.1.3", "vee-validate": "2.0.9", - "vue": "^2.6.14", + "vue": "^2.7.16", "vue-book": "0.1.0-alpha.9", "vue-bulma-expanding": "0.0.1", "vue-chartjs": "^3.5.1", @@ -98,6 +98,7 @@ }, "overrides": { "ajv": "^6.14.0", + "follow-redirects": "^1.16.0", "immutable": "^4.3.8", "picomatch": "^2.3.2", "underscore": "^1.13.8" diff --git a/server/k8s.js b/server/k8s.js index a5a3405..54ea066 100644 --- a/server/k8s.js +++ b/server/k8s.js @@ -25,23 +25,23 @@ const fs = require('fs'); const k8s = require('@kubernetes/client-node'); const kubeConfigFile = process.env.HOME + '/.kube/config'; -const secretPrefix = 'dashboard-user-' -const kc = new k8s.KubeConfig() -let k8sClient = null +const secretPrefix = 'dashboard-user-'; +const kc = new k8s.KubeConfig(); +let k8sClient = null; if (fs.existsSync(kubeConfigFile)) { cfg.L.info('set up kubernetes cluster dev local access'); - kc.loadFromFile(kubeConfigFile) - k8sClient = kc.makeApiClient(k8s.CoreV1Api) + kc.loadFromFile(kubeConfigFile); + k8sClient = kc.makeApiClient(k8s.CoreV1Api); } else if ( - (process.env.KUBERNETES_SERVICE_HOST != '' || cfg.globalConf.server_config.kubernetes.service_host != '') && - (process.env.KUBERNETES_SERVICE_PORT != '' || cfg.globalConf.server_config.kubernetes.service_port != '') + ((process.env.KUBERNETES_SERVICE_HOST && process.env.KUBERNETES_SERVICE_HOST !== '') || cfg.globalConf.server_config.kubernetes.service_host !== '') && + ((process.env.KUBERNETES_SERVICE_PORT && process.env.KUBERNETES_SERVICE_PORT !== '') || cfg.globalConf.server_config.kubernetes.service_port !== '') ) { - kc.loadFromCluster() - k8sClient = kc.makeApiClient(k8s.CoreV1Api) + kc.loadFromCluster(); + k8sClient = kc.makeApiClient(k8s.CoreV1Api); cfg.L.info('set up kubernetes in-cluster access'); } else { - cfg.L.error("no kubernetes cluster access ") + cfg.L.error('no kubernetes cluster access '); } /** * Get secret from the key @@ -53,7 +53,6 @@ const getSecrets = async (namespace, key) => { return null } const secrets = await k8sClient.listNamespacedSecret(namespace); - const items = secrets.body && secrets.body.items ? secrets.body.items : [] const secretName = secretPrefix + key for (let i = 0; i < items.length; i++) { let item = items[i] diff --git a/server/package-lock.json b/server/package-lock.json index 125522d..3184433 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1052,9 +1052,9 @@ } }, "node_modules/@kubernetes/client-node/node_modules/ws": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz", - "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==", + "version": "8.20.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz", + "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==", "engines": { "node": ">=10.0.0" }, @@ -1234,9 +1234,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "24.12.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.3.tgz", - "integrity": "sha512-8oljBDGun9cIsZRJR6fkihn0TSXJI0UDOOhncYaERq6M0JMDoPLxyscwruJcb4GKS6dvK/d8xebYBg27h/duaQ==", + "version": "24.12.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.4.tgz", + "integrity": "sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==", "dependencies": { "undici-types": "~7.16.0" } @@ -6551,9 +6551,9 @@ } }, "ws": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz", - "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==", + "version": "8.20.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz", + "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==", "requires": {} } } @@ -6712,9 +6712,9 @@ "dev": true }, "@types/node": { - "version": "24.12.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.3.tgz", - "integrity": "sha512-8oljBDGun9cIsZRJR6fkihn0TSXJI0UDOOhncYaERq6M0JMDoPLxyscwruJcb4GKS6dvK/d8xebYBg27h/duaQ==", + "version": "24.12.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.4.tgz", + "integrity": "sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==", "requires": { "undici-types": "~7.16.0" } diff --git a/server/package.json b/server/package.json index f2ceb75..943ac6f 100644 --- a/server/package.json +++ b/server/package.json @@ -19,6 +19,7 @@ "author": "ming luo", "license": "Apache-2.0", "dependencies": { + "@kubernetes/client-node": "^1.4.0", "axios": "^1.15.2", "body-parser": "^1.20.4", "config": "^3.3.7", @@ -27,7 +28,6 @@ "express": "^4.17.2", "http-proxy-middleware": "^2.0.9", "jsonwebtoken": "^9.0.0", - "@kubernetes/client-node": "^1.4.0", "random-id": "^1.0.4", "winston": "^3.4.0" }, @@ -37,11 +37,11 @@ "form-data": "^4.0.4", "lodash": "^4.18.1", "minimatch": "^3.1.3", + "path-to-regexp": "^0.1.13", "picomatch": "^2.3.2", "qs": "^6.14.2", - "underscore": "^1.13.8", - "path-to-regexp": "^0.1.13", "tough-cookie": "^4.1.3", + "underscore": "^1.13.8", "uuid": "^11.1.1" }, "devDependencies": {