Skip to content
GitLab
Commit 33a320e2 authored by ruanshudong's avatar ruanshudong
Browse files

fix k8s framework config load

parent 27d78f63
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 34 deletions
+44 -34
client/dist/k8s.html
+ 1
- 1
View file @ 33a320e2
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsK8s</title><link href=/static/css/chunk-common.e941c7c1.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/k8s.8c19f17a.css rel=preload as=style><link href=/static/js/chunk-common.3f597331.js rel=preload as=script><link href=/static/js/chunk-vendors.205991fe.js rel=preload as=script><link href=/static/js/k8s.22b5129d.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.e941c7c1.css rel=stylesheet><link href=/static/css/k8s.8c19f17a.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsK8s doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.205991fe.js></script><script src=/static/js/chunk-common.3f597331.js></script><script src=/static/js/k8s.22b5129d.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsK8s</title><link href=/static/css/chunk-common.e941c7c1.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/k8s.25efda75.css rel=preload as=style><link href=/static/js/chunk-common.3f597331.js rel=preload as=script><link href=/static/js/chunk-vendors.205991fe.js rel=preload as=script><link href=/static/js/k8s.0bb3688b.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.e941c7c1.css rel=stylesheet><link href=/static/css/k8s.25efda75.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsK8s doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.205991fe.js></script><script src=/static/js/chunk-common.3f597331.js></script><script src=/static/js/k8s.0bb3688b.js></script></body></html>
\ No newline at end of file
client/dist/static/js/k8s.0bb3688b.js 0 → 100644
+ 1
- 0
View file @ 33a320e2
This source diff could not be displayed because it is too large. You can view the blob instead.
client/dist/static/js/k8s.22b5129d.js deleted 100644 → 0
+ 0
- 1
View file @ 27d78f63
This source diff could not be displayed because it is too large. You can view the blob instead.
client/src/k8s/operation/frameworkConfig.vue
+ 1
- 1
View file @ 33a320e2
......@@ -56,7 +56,7 @@
</el-table>
<el-dialog
title="Taf Framework config"
title="Framework config"
width="50%"
top="50px"
:visible.sync="showDialog"
......
config/webConf.js
+ 12
- 12
View file @ 33a320e2
......@@ -149,17 +149,17 @@ if (process.env.NODE_ENV == "local") {
conf.k8s.uploadDomain = 'http://127.0.0.1:18080/api/v1beta1/timage';
}
if (conf.isEnableK8s() && fs.existsSync('/mnt/config/nativeDB.json')) {
try {
let content = require('/mnt/config/nativeDB.json');
conf.dbConf = content.dbConf;
conf.client = '/mnt/config/nativeFramework.conf';
conf.enable = content.enable;
conf.show = content.show;
} catch (e) {
console.log(e);
}
}
// if (conf.isEnableK8s() && fs.existsSync('/mnt/config/nativeDBConfig.json')) {
// try {
// let content = require('/mnt/config/nativeDBConfig.json');
// conf.dbConf = content.dbConf;
// conf.client = '/mnt/config/nativeFramework.conf';
// conf.enable = content.enable;
// conf.show = content.show;
// } catch (e) {
// console.log(e);
// }
// }
module.exports = conf;
\ No newline at end of file
index/json/cn.json
+ 1
- 1
View file @ 33a320e2
......@@ -1013,7 +1013,7 @@
"texitedPod": "pod 保存个数",
"timageRelease": "镜像保存条数",
"nativeDBConfig": "外部TARS框架 db配置信息",
"nativeFramewokConfig": "外部K8S框架 tars配置文件"
"nativeFrameworkConfig": "外部TARS框架 tars配置文件"
}
},
"deployService": {
......
index/json/en.json
+ 1
- 1
View file @ 33a320e2
......@@ -994,7 +994,7 @@
"texitedPod": "Number of pods saved",
"timageRelease": "Number of images saved",
"nativeDBConfig": "General taf db configuration information",
"nativeTafConfig": "Ordinary taf taf configuration file"
"nativeFramework": "Ordinary taf taf configuration file"
}
},
"deployService": {
......
k8s/service/common/CommonService.js
+ 4
- 4
View file @ 33a320e2
......@@ -229,11 +229,11 @@ CommonService.getTemplateList = async () => {
CommonService.getFrameworkConfig = async () => {
let res = await tConfigListFn();
console.log(res.body.items[0]);
return res.body.items[0];
console.log(res.body.items);
// return res.body.items[0];
// let res = await getCacheList(tConfigList, tConfigListFn)
// let tafFrameConfig = res.filter(item => item.metadata.name == CommonService.TFC)
// return tafFrameConfig ? tafFrameConfig[0] : {};
let frameConfig = res.body.items.filter(item => item.metadata.name == CommonService.TFC)
return frameConfig ? frameConfig[0] : {};
}
CommonService.getAccountList = async () => {
......
k8s/service/framework/FrameworkService.js
+ 23
- 13
View file @ 33a320e2
const logger = require("../../../logger")
const fs = require("fs")
const path = require("path");
const WebConf = require('../../../config/webConf');
const CommonService = require('../common/CommonService');
const FrameworkService = {};
FrameworkService.MNTFILEPATH = "/mnt/config"
// FrameworkService.MNTFILEPATH = "/tmp/config"
// FrameworkService.MNTFILEPATH = "/mnt/config"
FrameworkService.MNTFILEPATH = "/tmp/tars-framework"
FrameworkService.getFrameworkConfig = async () => {
let data = await CommonService.getFrameworkConfig();
......@@ -47,8 +48,8 @@ FrameworkService.getFrameworkConfig = async () => {
})
res.push({
column: "nativeFrameworkConfig",
remark: "#framework.remark.nativeFramewokConfig#",
value: data.expand.nativeFramewokConfig
remark: "#framework.remark.nativeFrameworkConfig#",
value: data.expand.nativeFrameworkConfig
})
return res
}
......@@ -58,7 +59,7 @@ FrameworkService.saveFrameworkConfig = async (params) => {
let tfc = data.body;
switch (params.column) {
case "nativeFrameworkConfig":
tfc.expand.nativeTafConfig = params.value;
tfc.expand.nativeFrameworkConfig = params.value;
break;
case "nativeDBConfig":
tfc.expand.nativeDBConfig = params.value;
......@@ -88,19 +89,28 @@ FrameworkService.saveFrameworkConfig = async (params) => {
FrameworkService.createFrameworkConfig = async () => {
// console.log(333)
// let config = await new Promise(((resolve, reject) => {
// let ret = CommonService.getObject("tframeworkconfigs", CommonService.TFC);
// resolve(ret)
// }))
let config = await CommonService.getFrameworkConfig();
console.log(" get tfc success", config)
let nativeFrameworkConfig = config.expand.nativeFrameworkConfig;
let nativeDBConfig = config.expand.nativeDBConfig;
mkdirSync(FrameworkService.MNTFILEPATH);
if (fs.existsSync(FrameworkService.MNTFILEPATH)) {
mkdirSync(FrameworkService.MNTFILEPATH);
fs.writeFileSync(`${FrameworkService.MNTFILEPATH}/nativeFramework.conf`, nativeFrameworkConfig);
fs.writeFileSync(`${FrameworkService.MNTFILEPATH}/nativeDB.json`, nativeDBConfig);
fs.writeFileSync(`${FrameworkService.MNTFILEPATH}/nativeFrameworkConfig.conf`, nativeFrameworkConfig);
fs.writeFileSync(`${FrameworkService.MNTFILEPATH}/nativeDBConfig.json`, nativeDBConfig);
try {
let content = `${FrameworkService.MNTFILEPATH}/nativeDBConfig.json`;
WebConf.dbConf = content.dbConf;
WebConf.client = `${FrameworkService.MNTFILEPATH}/nativeFrameworkConfig.conf`;
WebConf.enable = content.enable || false;
WebConf.show = content.show || false;
} catch (e) {
console.log(e);
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全