You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/10/22 01:42:34 UTC
[incubator-streampark] branch dev updated: [Bug] fixed 'Kube Conf File' param can not displayed at Flink Cluster Edit Page (#1879)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 812befbaa [Bug] fixed 'Kube Conf File' param can not displayed at Flink Cluster Edit Page (#1879)
812befbaa is described below
commit 812befbaaafb1e2f2b3d4e46125e458cbac0635d
Author: 秋天 <jk...@126.com>
AuthorDate: Sat Oct 22 09:42:27 2022 +0800
[Bug] fixed 'Kube Conf File' param can not displayed at Flink Cluster Edit Page (#1879)
---
.../src/api/flink/setting/types/flinkCluster.type.ts | 2 +-
.../src/views/flink/setting/EditCluster.vue | 2 +-
.../src/views/flink/setting/hooks/useClusterSetting.ts | 10 +++++-----
.../src/views/flink/setting/AddCluster.vue | 8 ++++----
.../src/views/flink/setting/EditCluster.vue | 10 +++++-----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts b/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts
index b7a8859db..47b171df6 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts
@@ -32,7 +32,7 @@ export interface FlinkCluster {
dynamicOptions: string;
k8sRestExposedType: number;
flameGraph: boolean;
- k8sConf?: any;
+ ?: any;
resolveOrder: number;
exception?: any;
clusterState: number;
diff --git a/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue b/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
index 1d01826eb..fbee7a888 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
+++ b/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
@@ -113,7 +113,7 @@
k8sRestExposedType: cluster.k8sRestExposedType,
flinkImage: cluster.flinkImage,
serviceAccount: cluster.serviceAccount,
- kubeConfFile: cluster.kubeConfFile,
+ k8sConf: cluster.k8sConf,
flameGraph: cluster.flameGraph,
k8sNamespace: cluster.k8sNamespace,
...resetParams,
diff --git a/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts b/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts
index 123e0c13d..8f51e44a2 100644
--- a/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts
+++ b/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts
@@ -45,13 +45,13 @@ export const useClusterSetting = () => {
k8sNamespace: string[];
k8sSessionClusterId: string[];
serviceAccount: string[];
- kubeConfFile: string[];
+ k8sConf: string[];
flinkImage: string[];
}>({
k8sNamespace: [],
k8sSessionClusterId: [],
serviceAccount: [],
- kubeConfFile: [],
+ k8sConf: [],
flinkImage: [],
});
@@ -188,14 +188,14 @@ export const useClusterSetting = () => {
}),
},
{
- field: 'kubeConfFile',
+ field: 'k8sConf',
label: 'Kube Conf File',
ifShow: ({ values }) => values.executionMode == 5,
component: 'Input',
render: ({ model, field }) =>
renderInputDropdown(model, field, {
placeholder: '~/.kube/config',
- options: historyRecord.kubeConfFile,
+ options: historyRecord.k8sConf,
}),
},
{
@@ -352,7 +352,7 @@ export const useClusterSetting = () => {
k8sRestExposedType: values.k8sRestExposedType,
k8sNamespace: values.k8sNamespace || null,
serviceAccount: values.serviceAccount,
- k8sConf: values.kubeConfFile,
+ k8sConf: values.k8sConf,
flinkImage: values.flinkImage || null,
address: values.address,
flameGraph: values.flameGraph,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue b/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue
index 0ee02b8b4..89359d3d8 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue
@@ -202,11 +202,11 @@
type="text"
placeholder="~/.kube/config"
allowClear
- v-decorator="[ 'kubeConfFile']">
+ v-decorator="[ 'k8sConf']">
<a-dropdown slot="addonAfter" placement="bottomRight">
<a-menu slot="overlay" trigger="['click', 'hover']">
<a-menu-item
- v-for="item in historyRecord.kubeConfFile"
+ v-for="item in historyRecord.k8sConf"
:key="item"
@click="handleSelectHistoryKubeConfFile(item)"
style="padding-right: 60px">
@@ -702,7 +702,7 @@ export default {
k8sRestExposedType: values.k8sRestExposedType,
k8sNamespace: values.k8sNamespace || null,
serviceAccount: values.serviceAccount,
- k8sConf: values.kubeConfFile,
+ k8sConf: values.k8sConf,
flinkImage: values.flinkImage || null,
address: values.address,
flameGraph: values.flameGraph,
@@ -880,7 +880,7 @@ export default {
},
handleSelectHistoryKubeConfFile(value) {
- this.form.setFieldsValue({'kubeConfFile': value})
+ this.form.setFieldsValue({'k8sConf': value})
},
handleSelectHistoryK8sSessionClusterId(value) {
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue b/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue
index 3ea78b25e..965fa9569 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue
@@ -202,11 +202,11 @@
type="text"
placeholder="~/.kube/config"
allowClear
- v-decorator="[ 'kubeConfFile']">
+ v-decorator="[ 'k8sConf']">
<a-dropdown slot="addonAfter" placement="bottomRight">
<a-menu slot="overlay" trigger="['click', 'hover']">
<a-menu-item
- v-for="item in historyRecord.kubeConfFile"
+ v-for="item in historyRecord.k8sConf"
:key="item"
@click="handleSelectHistoryKubeConfFile(item)"
style="padding-right: 60px">
@@ -664,7 +664,7 @@ export default {
'k8sRestExposedType': this.cluster.k8sRestExposedType,
'flinkImage': this.cluster.flinkImage,
'serviceAccount': this.cluster.serviceAccount,
- 'kubeConfFile': this.cluster.kubeConfFile,
+ 'k8sConf': this.cluster.k8sConf,
'flameGraph': this.cluster.flameGraph,
'k8sNamespace': this.cluster.k8sNamespace
})
@@ -795,7 +795,7 @@ export default {
k8sRestExposedType: values.k8sRestExposedType,
k8sNamespace: values.k8sNamespace || null,
serviceAccount: values.serviceAccount,
- k8sConf: values.kubeConfFile,
+ k8sConf: values.k8sConf,
flinkImage: values.flinkImage || null,
address: values.address,
flameGraph: values.flameGraph,
@@ -976,7 +976,7 @@ export default {
},
handleSelectHistoryKubeConfFile(value) {
- this.form.setFieldsValue({'kubeConfFile': value})
+ this.form.setFieldsValue({'k8sConf': value})
},
handleSelectHistoryK8sSessionClusterId(value) {