diff --git a/deploy/charts/octopus/values.yaml b/deploy/charts/octopus/values.yaml
index c91004ec..f84969bc 100644
--- a/deploy/charts/octopus/values.yaml
+++ b/deploy/charts/octopus/values.yaml
@@ -331,6 +331,22 @@ nginx-ingress-controller:
- key: beta.kubernetes.io/arch
operator: In
values: ["amd64", "x64", "x86-64", "x86_64"]
+ defaultBackend:
+ affinity:
+ nodeAffinity:
+ preferredDuringSchedulingIgnoredDuringExecution:
+ - weight: 100
+ preference:
+ matchExpressions:
+ - key: kubernetes.io/arch
+ operator: In
+ values: ["amd64", "x64", "x86-64", "x86_64"]
+ - weight: 100
+ preference:
+ matchExpressions:
+ - key: beta.kubernetes.io/arch
+ operator: In
+ values: ["amd64", "x64", "x86-64", "x86_64"]
# influxdb
influxdb:
diff --git a/openai-portal/src/api/modelDev.js b/openai-portal/src/api/modelDev.js
index 756a0c55..1d0a7e8c 100644
--- a/openai-portal/src/api/modelDev.js
+++ b/openai-portal/src/api/modelDev.js
@@ -25,10 +25,11 @@ export async function getNotebookList(payload) {
return res
}
-export async function getNotebookInfo(id) {
+export async function getNotebookInfo(params) {
const res = await request({
- url: `/v1/developmanage/notebook/${id}`,
- method: 'get'
+ url: `/v1/developmanage/notebookevent`,
+ method: 'get',
+ params
})
return res
}
diff --git a/openai-portal/src/views/modelDev/components/notebook/notebookInfo.vue b/openai-portal/src/views/modelDev/components/notebook/notebookInfo.vue
index 10101f23..f68d5e4a 100644
--- a/openai-portal/src/views/modelDev/components/notebook/notebookInfo.vue
+++ b/openai-portal/src/views/modelDev/components/notebook/notebookInfo.vue
@@ -2,44 +2,121 @@
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/openai-portal/src/views/modelDev/components/notebook/notebookList.vue b/openai-portal/src/views/modelDev/components/notebook/notebookList.vue
index 6bf8c19d..eef852a4 100644
--- a/openai-portal/src/views/modelDev/components/notebook/notebookList.vue
+++ b/openai-portal/src/views/modelDev/components/notebook/notebookList.vue
@@ -73,7 +73,7 @@
>
停止
-
+
信息
@@ -93,7 +93,7 @@
{
- if (response.success) {
- this.notebookInfoVisible = true
- const notebookDialogString = response.payload.notebook.initInfo ? response.payload.notebook.initInfo.replace(/\n/g, "
") : ''
- const notebookDialogData = JSON.parse(notebookDialogString)
- for (const pid in notebookDialogData['podEvents']) {
- const eventList = notebookDialogData['podEvents'][pid]
- const roleName = notebookDialogData['podRoleName'][pid]
- if (roleName == "") {
- continue
- }
- let message = ""
- for (const key in eventList) {
- const event = eventList[key]
- if (event['reason'] == "" && event['message'] == "") {
- continue
- }
- message += "[" + event['reason'] + "]" + "
"
- message += event['message'] + "
"
- }
- for (const key in notebookDialogData['extras']) {
- const event = notebookDialogData['extras'][key]
- if (event['reason'] == "" && event['message'] == "") {
- continue
- }
- message += "[" + event['reason'] + "]" + "
"
- message += event['message'] + "
"
- }
- message += "
"
- this.initInfo = message
- }
- } else {
- this.$message({
- message: this.getErrorMsg(response.error.subcode),
- type: 'warning'
- })
- }
- })
+ showNotebookInfo(row) {
+ this.notebookInfoVisible = true
+ this.notebookData = row
},
handleStop(row) {
stopNotebook(row.id).then(response => {
@@ -368,19 +332,16 @@
close(val) {
this.notebookVisible = val;
this.notebookInfoVisible = val;
- this.initInfo = ""
this.getNotebookList(this.searchData);
},
cancel(val) {
this.notebookVisible = val;
this.notebookInfoVisible = val;
- this.initInfo = ""
this.getNotebookList(this.searchData);
},
confirm(val) {
this.notebookVisible = val
this.notebookInfoVisible = val;
- this.initInfo = ""
this.getNotebookList(this.searchData);
}
}
diff --git a/openai-portal/src/views/trainingManager/components/detailDialog/taskInfo.vue b/openai-portal/src/views/trainingManager/components/detailDialog/taskInfo.vue
index 01a368f0..4bf6c0d8 100644
--- a/openai-portal/src/views/trainingManager/components/detailDialog/taskInfo.vue
+++ b/openai-portal/src/views/trainingManager/components/detailDialog/taskInfo.vue
@@ -44,14 +44,14 @@
@@ -59,7 +59,6 @@