fix: Fix servicemesh settings in federated project

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 17, 2020 · b82ab13 · b82ab13
1 parent f71c2dc
commit b82ab13
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/locales/zh/workload.js b/src/locales/zh/workload.js
@@ -167,7 +167,7 @@ export default {
   REPLICAS_SCALE_NOTIFY_CANCEL: '放弃更改',
 
   POD_SETTING_TIP: '更新时容器组数量',
-  MAX_UNAVAILABLE_POD_LABEL: '容器组最大可用数量',
+  MAX_UNAVAILABLE_POD_LABEL: '容器组最大不可用数量',
   MAX_SURGE_POD_LABEL: '更新时容器组最大数量',
   UPDATE_STRATEGY_DESC:
     '配置升级过程中替换容器组的策略 <a href="{link}" target="_blank">了解更多</a>',

diff --git a/src/pages/fedprojects/App.jsx b/src/pages/fedprojects/App.jsx
@@ -16,9 +16,10 @@
  * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
  */
 import React, { Component } from 'react'
+import { set } from 'lodash'
+import { toJS } from 'mobx'
 import { inject, observer, Provider } from 'mobx-react'
 
-import { toJS } from 'mobx'
 import { Loading } from '@pitrix/lego-ui'
 
 import { renderRoutes } from 'utils/router.config'
@@ -61,6 +62,10 @@ export default class App extends Component {
     })
     this.store.detail.clusters = toJS(this.clusterStore.list.data)
 
+    this.store.detail.clusters.forEach(cluster => {
+      set(globals, `clusterConfig.${cluster.name}`, cluster.configz)
+    })
+
     await this.props.rootStore.getRules(params)
 
     globals.app.cacheHistory(this.props.match.url, {

diff --git a/src/pages/fedprojects/containers/AdvancedSettings/InternetAccess/Access/index.jsx b/src/pages/fedprojects/containers/AdvancedSettings/InternetAccess/Access/index.jsx
@@ -270,7 +270,7 @@ class InternetAccess extends React.Component {
     return (
       <div>
         <GatewaySettingModal
-          cluster={cluster}
+          cluster={cluster.name}
           detail={toJS(this.store.gateway.data)}
           visible={this.state.showGatewaySetting}
           onOk={this.handleGatewaySetting}