Skip to content

Commit

Permalink
add "Local DNS Proxy" config for mesh
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangcheng870518 committed Jan 30, 2023
1 parent e4d866f commit cbeefd5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
2 changes: 2 additions & 0 deletions packages/gui/src/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ module.exports = {
"Debug Server": "调试服务",
"Privileged Init Container": "特权初始化容器",
"Config Resync Interval": "配置重新同步间隔",
"Local DNS Proxy": "本地DNS代理",
Interval: "间隔",
"Tls Protocol Version (Min)": "Tls协议最小版本",
"Tls Protocol Version (Max)": "Tls协议最大版本",
Expand Down Expand Up @@ -998,6 +999,7 @@ module.exports = {
"Debug Server": "デバッグサーバー",
"Privileged Init Container": "特権初期化コンテナ",
"Config Resync Interval": "再同期間隔の設定",
"Local DNS Proxy": "ローカルDNSプロキシ",
Interval: "間隔",
"Tls Protocol Version (Min)": "Tls最小バージョン",
"Tls Protocol Version (Max)": "Tls最大バージョン",
Expand Down
12 changes: 11 additions & 1 deletion packages/gui/src/pages/fsm/MeshDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,19 @@
:placeholder="$t('unset')"
/>
</a-descriptions-item>
<a-descriptions-item
:label="$t('Local DNS Proxy')"
:span="1"
>
<a-switch
v-model:checked="
detail.config.spec.sidecar.localDNSProxy.enable
"
/>
</a-descriptions-item>
<a-descriptions-item
:label="$t('Resources')"
:span="3"
:span="2"
>
<TagMap
v-model:map="detail.config.spec.sidecar.resources"
Expand Down
4 changes: 4 additions & 0 deletions packages/server/api/mesh/services/mesh.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ module.exports = {
ch.content.user + ':' + ch.content.password
).toString('base64');
result.options.osm.remoteLogging.authorization = 'Basic ' + base64Str;

if (result.mcsEnable) {
result.options.osm.localDNSProxy.enable=true
}
}

const registry = await strapi
Expand Down

0 comments on commit cbeefd5

Please sign in to comment.