feat: hgctl install profile support resource configuration #823
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
sjcsjc123
requested review from
SpecialYang,
johnlanni and
CH3CHO
as code owners
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #823 +/- ##
==========================================
+ Coverage 38.04% 38.10% +0.06%
==========================================
Files 61 61
Lines 10428 10428
==========================================
+ Hits 3967 3974 +7
+ Misses 6161 6154 -7
Partials 300 300 |
2456868764
reviewed
Feb 15, 2024
pkg/cmd/hgctl/helm/profile.go
Outdated
| return "", err | ||
| } | ||
|
|
||
| err = yaml.Unmarshal(resourceYAML, &p.Values) |
There was a problem hiding this comment.
这里有些问题：这里会覆盖 Values 相关Resource设置， 要保证相同设置 Values里值高优先。用util.OverlayYAML 合并。
There was a problem hiding this comment.
这里外层的配置覆盖values里的值是否也合理？
There was a problem hiding this comment.
已修复，当在profile的value字段进行如下配置的时候，通过debug发现valueOverlayYAML结果符合预期。
- profile value配置：
values:
higress-core:
controller:
resources:
requests:
cpu: 1213m
memory: 2018Mi
limits:
cpu: 1213m
memory: 2018Mi
- valueOverlayYAML结果：
higress-console:
resources:
limits:
cpu: 2000m
memory: 2048Mi
requests:
cpu: 250m
memory: 512Mi
higress-core:
controller:
resources:
limits:
cpu: 1213m
memory: 2018Mi
requests:
cpu: 1213m
memory: 2018Mi
gateway:
resources:
limits:
cpu: 2000m
memory: 2048Mi
requests:
cpu: 2000m
memory: 2048Mi
There was a problem hiding this comment.
这里外层的配置覆盖values里的值是否也合理？
这里主要考虑到和helm 安装兼容，所以values 优先级高
|
LGTM |
Renz7
pushed a commit
to Renz7/higress
that referenced
this pull request
Mar 4, 2024
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.
Ⅰ. Describe what this PR did
支持resources配置
Ⅱ. Does this pull request fix one issue?
fixes: #571
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
运行hgctl install --set profile=k8s命令，可以看到deploy yaml文件多了resource配置
Ⅴ. Special notes for reviews