feat: 模板文件支持 Helm 语法模式 #3494
Merged
feat: 模板文件支持 Helm 语法模式 #3494
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LidolLxf
force-pushed
the
feat_template_helm
branch
from
c0db00c
to
95146f5
Compare
adevjoe
suggested changes
Sep 19, 2024
| @@ -3409,6 +3409,12 @@ message DeployTemplateFileReq { | |||
| string namespace = 5 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = { | |||
| title: "命名空间" | |||
| }, (validate.rules).string = {min_len : 1, max_len : 64}]; | |||
| string grammarMode = 6 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = { | |||
There was a problem hiding this comment.
templatefile 版本创建出来就已经有语法模式了，部署这里不用传
| @@ -575,6 +595,19 @@ func (t *TemplateAction) DeployTemplateFile(ctx context.Context, req *clusterRes | |||
| return nil, err | |||
| } | |||
|
|
|||
| // helm 语法模式 | |||
| if req.GrammarMode == "Helm" { | |||
There was a problem hiding this comment.
语法模式放在 templatefile 里面，类似于 editFormat 一样，前端可以根据语法模式不同展现形式不同。
部署的时候自动从 templatefile 里面读取语法模式
adevjoe
suggested changes
Sep 19, 2024
| @@ -517,6 +524,19 @@ func (t *TemplateAction) PreviewTemplateFile(ctx context.Context, req *clusterRe | |||
| return nil, err | |||
| } | |||
|
|
|||
| // helm 语法模式 | |||
| if req.GrammarMode == "Helm" { | |||
LidolLxf
force-pushed
the
feat_template_helm
branch
from
95146f5
to
fce11ff
Compare
adevjoe
suggested changes
Sep 23, 2024
| const ( | ||
| // HelmRenderMode helm 语法模式 | ||
| HelmRenderMode RenderMode = "Helm" | ||
| // SimpleRenderMode 单一语法模式，默认 |
| @@ -517,6 +528,16 @@ func (t *TemplateAction) PreviewTemplateFile(ctx context.Context, req *clusterRe | |||
| return nil, err | |||
| } | |||
|
|
|||
| // helm 语法模式 模板文件内容进行helm template 渲染 | |||
| content, errRender := renderHelmTemplate(templates, req.GetValues()) | |||
LidolLxf
force-pushed
the
feat_template_helm
branch
from
a846194
to
3decee1
Compare
adevjoe
suggested changes
Oct 9, 2024
| @@ -575,6 +598,18 @@ func (t *TemplateAction) DeployTemplateFile(ctx context.Context, req *clusterRes | |||
| return nil, err | |||
| } | |||
|
|
|||
| // helm 语法模式 模板文件内容进行helm template 渲染 | |||
| content, errRender := renderHelmTemplate(templates, req.GetValues()) | |||
LidolLxf
force-pushed
the
feat_template_helm
branch
2 times, most recently
from
7f1e1b3
to
272d703
Compare
ifooth
approved these changes
Oct 11, 2024
evanlixin
added a commit
that referenced
this pull request
Oct 14, 2024
* github-bk-bcs/master: feat: 配置示例新增windows路径需求--story=119618143 (#3549) fix: 修复客户端事件列表接口 (#3568) fix: 客户端事件列表过滤跳过的事件数据 (#3558) feat: HTTP接口拉取文件支持设置labels (#3567) feat: 资源视图表单 cronjob 表达式支持正则 (#3540) feat: 模板文件支持 Helm 语法模式 (#3494) feat: cmd命令行缺少空格问题--story=119697737 (#3566) feat: 1.配置示例-配置文件筛选体验优化--story=119697737 (#3565)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
feat: 模板文件支持 Helm 语法模式