Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
koderover
zadig
提交
b1f37c7e
zadig
项目概览
koderover
/
zadig
9 个月 前同步成功
通知
10
Star
2407
Fork
754
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
zadig
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
b1f37c7e
编写于
8月 10, 2023
作者:
S
shendongdong
提交者:
GitHub
8月 10, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove useless log and add detailed log (#2944)
Signed-off-by:
N
allenshen
<
shendongdong@koderover.com
>
上级
78151fd0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
7 deletion
+6
-7
pkg/microservice/aslan/core/common/service/kube/render.go
pkg/microservice/aslan/core/common/service/kube/render.go
+0
-1
pkg/tool/nacos/client.go
pkg/tool/nacos/client.go
+6
-6
未找到文件。
pkg/microservice/aslan/core/common/service/kube/render.go
浏览文件 @
b1f37c7e
...
@@ -574,7 +574,6 @@ func GenerateRenderedYaml(option *GeneSvcYamlOption) (string, int, []*WorkloadRe
...
@@ -574,7 +574,6 @@ func GenerateRenderedYaml(option *GeneSvcYamlOption) (string, int, []*WorkloadRe
return
""
,
0
,
nil
,
err
return
""
,
0
,
nil
,
err
}
}
fullRenderedYaml
=
ParseSysKeys
(
productInfo
.
Namespace
,
productInfo
.
EnvName
,
option
.
ProductName
,
option
.
ServiceName
,
fullRenderedYaml
)
fullRenderedYaml
=
ParseSysKeys
(
productInfo
.
Namespace
,
productInfo
.
EnvName
,
option
.
ProductName
,
option
.
ServiceName
,
fullRenderedYaml
)
log
.
Infof
(
"fullRenderedYaml is: %s"
,
fullRenderedYaml
)
// service may not be deployed in environment, we need to extract containers again, since image related variables may be changed
// service may not be deployed in environment, we need to extract containers again, since image related variables may be changed
latestSvcTemplate
.
KubeYamls
=
util
.
SplitYaml
(
fullRenderedYaml
)
latestSvcTemplate
.
KubeYamls
=
util
.
SplitYaml
(
fullRenderedYaml
)
...
...
pkg/tool/nacos/client.go
浏览文件 @
b1f37c7e
...
@@ -69,7 +69,7 @@ const (
...
@@ -69,7 +69,7 @@ const (
func
NewNacosClient
(
serverAddr
,
userName
,
password
string
)
(
*
Client
,
error
)
{
func
NewNacosClient
(
serverAddr
,
userName
,
password
string
)
(
*
Client
,
error
)
{
host
,
err
:=
url
.
Parse
(
serverAddr
)
host
,
err
:=
url
.
Parse
(
serverAddr
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
errors
.
New
(
"parse nacos server address failed"
)
return
nil
,
errors
.
Wrap
(
err
,
"parse nacos server address failed"
)
}
}
// add default context path
// add default context path
if
host
.
Path
==
""
{
if
host
.
Path
==
""
{
...
@@ -82,7 +82,7 @@ func NewNacosClient(serverAddr, userName, password string) (*Client, error) {
...
@@ -82,7 +82,7 @@ func NewNacosClient(serverAddr, userName, password string) (*Client, error) {
SetResult
(
&
result
)
.
SetResult
(
&
result
)
.
Post
(
loginURL
)
Post
(
loginURL
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
errors
.
New
(
"login nacos failed"
)
return
nil
,
errors
.
Wrap
(
err
,
"login nacos failed"
)
}
}
if
!
resp
.
IsSuccess
()
{
if
!
resp
.
IsSuccess
()
{
return
nil
,
errors
.
New
(
"login nacos failed"
)
return
nil
,
errors
.
New
(
"login nacos failed"
)
...
@@ -120,7 +120,7 @@ func (c *Client) ListNamespaces() ([]*types.NacosNamespace, error) {
...
@@ -120,7 +120,7 @@ func (c *Client) ListNamespaces() ([]*types.NacosNamespace, error) {
url
:=
"/v1/console/namespaces"
url
:=
"/v1/console/namespaces"
res
:=
&
namespaceResp
{}
res
:=
&
namespaceResp
{}
if
_
,
err
:=
c
.
Client
.
Get
(
url
,
httpclient
.
SetResult
(
res
));
err
!=
nil
{
if
_
,
err
:=
c
.
Client
.
Get
(
url
,
httpclient
.
SetResult
(
res
));
err
!=
nil
{
return
nil
,
errors
.
New
(
"list nacos namespace failed"
)
return
nil
,
errors
.
Wrap
(
err
,
"list nacos namespace failed"
)
}
}
resp
:=
[]
*
types
.
NacosNamespace
{}
resp
:=
[]
*
types
.
NacosNamespace
{}
for
_
,
namespace
:=
range
res
.
Data
{
for
_
,
namespace
:=
range
res
.
Data
{
...
@@ -152,7 +152,7 @@ func (c *Client) ListConfigs(namespaceID string) ([]*types.NacosConfig, error) {
...
@@ -152,7 +152,7 @@ func (c *Client) ListConfigs(namespaceID string) ([]*types.NacosConfig, error) {
"tenant"
:
namespaceID
,
"tenant"
:
namespaceID
,
})
})
if
_
,
err
:=
c
.
Client
.
Get
(
url
,
params
,
httpclient
.
SetResult
(
res
));
err
!=
nil
{
if
_
,
err
:=
c
.
Client
.
Get
(
url
,
params
,
httpclient
.
SetResult
(
res
));
err
!=
nil
{
return
nil
,
errors
.
New
(
"list nacos config failed"
)
return
nil
,
errors
.
Wrap
(
err
,
"list nacos config failed"
)
}
}
for
_
,
conf
:=
range
res
.
PageItems
{
for
_
,
conf
:=
range
res
.
PageItems
{
resp
=
append
(
resp
,
&
types
.
NacosConfig
{
resp
=
append
(
resp
,
&
types
.
NacosConfig
{
...
@@ -181,7 +181,7 @@ func (c *Client) GetConfig(dataID, group, namespaceID string) (*types.NacosConfi
...
@@ -181,7 +181,7 @@ func (c *Client) GetConfig(dataID, group, namespaceID string) (*types.NacosConfi
"show"
:
"all"
,
"show"
:
"all"
,
})
})
if
_
,
err
:=
c
.
Client
.
Get
(
url
,
params
,
httpclient
.
SetResult
(
res
));
err
!=
nil
{
if
_
,
err
:=
c
.
Client
.
Get
(
url
,
params
,
httpclient
.
SetResult
(
res
));
err
!=
nil
{
return
nil
,
errors
.
New
(
"get nacos config failed"
)
return
nil
,
errors
.
Wrap
(
err
,
"get nacos config failed"
)
}
}
return
&
types
.
NacosConfig
{
return
&
types
.
NacosConfig
{
DataID
:
res
.
DataID
,
DataID
:
res
.
DataID
,
...
@@ -202,7 +202,7 @@ func (c *Client) UpdateConfig(dataID, group, namespaceID, content, format string
...
@@ -202,7 +202,7 @@ func (c *Client) UpdateConfig(dataID, group, namespaceID, content, format string
"type"
:
setFormat
(
format
),
"type"
:
setFormat
(
format
),
}
}
if
_
,
err
:=
c
.
Client
.
Post
(
path
,
httpclient
.
SetFormData
(
formValues
));
err
!=
nil
{
if
_
,
err
:=
c
.
Client
.
Post
(
path
,
httpclient
.
SetFormData
(
formValues
));
err
!=
nil
{
return
errors
.
New
(
"update nacos config failed"
)
return
errors
.
Wrap
(
err
,
"update nacos config failed"
)
}
}
return
nil
return
nil
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录