Skip to content

Commit 361a6bf

Browse files
chuntaojunchuntaojun
authored
fix:配置灰度发布只支持ClientIP (#259)
1 parent 544a750 commit 361a6bf

File tree

9 files changed

+51
-19
lines changed

9 files changed

+51
-19
lines changed

‎build_docker.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@ if [ $# != 1 ]; then
99
fi
1010

1111
docker_tag=$1
12-
docker_repository="polarismesh"
12+
docker_repository="${DOCKER_REPOSITORY}"
13+
if [[ "${docker_repository}" == "" ]]; then
14+
docker_repository="polarismesh"
15+
fi
1316

14-
echo "docker repository : polarismesh/polaris-console, tag : ${docker_tag}"
17+
echo "docker repository : ${docker_repository}/polaris-console, tag : ${docker_tag}"
1518

1619
arch_list=( "amd64" "arm64" )
1720
platforms=""
1821

1922
for arch in ${arch_list[@]}; do
2023
export GOARCH=${arch}
24+
export GOOS="linux"
2125
bash build.sh ${docker_tag}
2226
if [ $? != 0 ]; then
2327
echo "build polaris-console failed"
@@ -28,12 +32,12 @@ for arch in ${arch_list[@]}; do
2832
platforms+="linux/${arch},"
2933
done
3034

31-
platforms=${platforms::-1}
35+
platforms=${platforms%?}
3236
extra_tags=""
3337

3438
pre_release=`echo ${docker_tag}|egrep "(alpha|beta|rc|[T|t]est)"|wc -l`
3539
if [ ${pre_release} == 0 ]; then
3640
extra_tags="-t ${docker_repository}/polaris-console:latest"
3741
fi
3842

39-
docker buildx build --network=host -t ${docker_repository}/polaris-console:${docker_tag} ${extra_tags} --platform ${platforms} --push ./
43+
docker buildx build -t ${docker_repository}/polaris-console:${docker_tag} ${extra_tags} --platform ${platforms} --push ./

‎router/discovery_router.go

+10
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ func DiscoveryV1Router(r *gin.Engine, config *bootstrap.Config) {
7373
v1.GET("/:resource/rules", handlers.ReverseProxyForServer(&config.PolarisServer, config))
7474
// 查看服务绑定的熔断规则
7575
v1.GET("/:resource/all", handlers.ReverseProxyForServer(&config.PolarisServer, config))
76+
// 查询服务契约版本列表
77+
v1.GET("/:resource/contract/versions", handlers.ReverseProxyForServer(&config.PolarisServer, config))
78+
// 查询服务契约列表
79+
v1.GET("/:resource/contracts", handlers.ReverseProxyForServer(&config.PolarisServer, config))
7680

7781
// 修改资源
7882
v1.PUT("/:resource", handlers.ReverseProxyForServer(&config.PolarisServer, config))
@@ -107,6 +111,12 @@ func DiscoveryV1Router(r *gin.Engine, config *bootstrap.Config) {
107111
v1.POST("/circuitbreaker/rules/delete", handlers.ReverseProxyForServer(&config.PolarisServer, config))
108112
// delete the FaultDetector rules
109113
v1.POST("/faultdetectors/delete", handlers.ReverseProxyForServer(&config.PolarisServer, config))
114+
// 服务契约
115+
v1.POST("/service/contracts/delete", handlers.ReverseProxyForServer(&config.PolarisServer, config))
116+
// 在对应契约版本中添加接口列表
117+
v1.POST("/service/contract/methods", handlers.ReverseProxyForServer(&config.PolarisServer, config))
118+
// 在对应契约版本中删除部份接口列表
119+
v1.POST("/service/contract/methods/delete", handlers.ReverseProxyForServer(&config.PolarisServer, config))
110120
}
111121

112122
// DiscoveryV2Router 路由请求

‎web/package-lock.json

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/src/polaris/administration/dynamicRoute/customRoute/PageDuck.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ export default class CustomRouteDuck extends GridPageDuck {
267267
cmdb_mod2: '',
268268
cmdb_mod3: '',
269269
department: serviceData.department,
270+
export_to: serviceData.export_to,
270271
},
271272
]),
272273
)

‎web/src/polaris/configuration/fileGroup/detail/file/Page.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ export default function Page(props: DuckCmpProps<Duck>) {
224224
fullExpandable
225225
height={900}
226226
style={{ width: '450px', maxWidth: '450px' }}
227-
// onSelect={v => {
228-
// handlers.select(v)
229-
// }}
230-
// selectable
231-
// selectedIds={selection}
232-
// selectValueMode={'onlyLeaf'}
227+
// onSelect={v => {
228+
// handlers.select(v)
229+
// }}
230+
// selectable
231+
// selectedIds={selection}
232+
// selectValueMode={'onlyLeaf'}
233233
>
234234
{renderTree(props, fileTree, '', '')}
235235
</Tree>
@@ -280,8 +280,8 @@ export default function Page(props: DuckCmpProps<Duck>) {
280280
content={
281281
currentNode.tags.length > 3
282282
? currentNode.tags?.map(item => (
283-
<Text parent={'div'} key={item.key}>{`${item.key}:${item.value}`}</Text>
284-
))
283+
<Text parent={'div'} key={item.key}>{`${item.key}:${item.value}`}</Text>
284+
))
285285
: null
286286
}
287287
>

‎web/src/polaris/configuration/fileGroup/types.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ export enum ClientLabelType {
9898
}
9999

100100
export const ClientLabelTypeOptions = [
101-
{
102-
value: ClientLabelType.CLIENT_ID,
103-
text: '客户端ID',
104-
},
101+
// {
102+
// value: ClientLabelType.CLIENT_ID,
103+
// text: '客户端ID',
104+
// },
105105
{
106106
value: ClientLabelType.CLIENT_IP,
107-
text: '客户端Host',
107+
text: '客户端IP',
108108
},
109109
// {
110110
// value: ClientLabelType.CLIENT_LANGUAGE,

‎web/src/polaris/service/model.ts

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export interface CreateServicesParams {
2929
department: string
3030
user_ids?: string[]
3131
group_ids?: string[]
32+
export_to?: string[]
3233
}
3334

3435
export interface ModifyServicesParams {
@@ -47,6 +48,7 @@ export interface ModifyServicesParams {
4748
group_ids?: string[]
4849
remove_user_ids?: string[]
4950
remove_group_ids?: string[]
51+
export_to?: string[]
5052
}
5153
export interface DescribeNamespacesResult {
5254
amount: number

‎web/src/polaris/service/operation/Create.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { DuckCmpProps, purify } from 'saga-duck'
3-
import Duck, { VisibilityMode } from './CreateDuck'
3+
import Duck, { CheckVisibilityMode, VisibilityMode } from './CreateDuck'
44
import { Form, Select, Text, Icon, Bubble, Button, FormItem, Radio, RadioGroup, SelectMultiple } from 'tea-component'
55
import FormField from '@src/polaris/common/duckComponents/form/Field'
66
import Input from '@src/polaris/common/duckComponents/form/Input'
@@ -42,6 +42,8 @@ const CreateForm = purify(function CreateForm(props: DuckCmpProps<Duck>) {
4242
'export_to',
4343
'visibilityMode',
4444
])
45+
46+
visibilityMode.setValue(CheckVisibilityMode(export_to.getValue(), namespace))
4547
const options = selectors.options(store)
4648
const [showAdvance, setShowAdvance] = React.useState(false)
4749

‎web/src/polaris/service/operation/CreateDuck.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const VisibilityModeMap = {
2424
export const CheckVisibilityMode = (exportTo = [], namespace) => {
2525
return exportTo?.includes('*')
2626
? VisibilityMode.All
27-
: exportTo.length === 1 && exportTo?.[0] === namespace
27+
: (exportTo.length === 1 && exportTo?.[0] === namespace) || exportTo.length === 0
2828
? VisibilityMode.Single
2929
: ''
3030
}
@@ -97,6 +97,7 @@ export default class CreateDuck extends FormDialog {
9797
group_ids: groupIds,
9898
remove_user_ids: removeUserIds,
9999
remove_group_ids: removeGroupIds,
100+
export_to: values.export_to,
100101
},
101102
]),
102103
)
@@ -115,6 +116,7 @@ export default class CreateDuck extends FormDialog {
115116
department: values.department,
116117
user_ids: userIds,
117118
group_ids: groupIds,
119+
export_to: values.export_to,
118120
},
119121
]),
120122
)

0 commit comments

Comments
 (0)