SKS-2193: Support setting the owner of ElfCluster and virtual machines #162
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
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #162 +/- ##
==========================================
+ Coverage 59.31% 59.36% +0.04%
==========================================
Files 19 20 +1
Lines 3520 3546 +26
==========================================
+ Hits 2088 2105 +17
- Misses 1283 1292 +9
Partials 149 149 ☔ View full report in Codecov by Sentry. |
jessehu
reviewed
Dec 6, 2023
pkg/service/vm.go
Outdated
| @@ -241,11 +243,21 @@ func (svr *TowerVMService) Clone( | |||
| hostID = *host.ID | |||
| } | |||
|
|
|||
| var owner *models.VMOwnerParams | |||
| if createdBy := annotationsutil.GetCreatedBy(elfCluster); createdBy != "" { | |||
| creator := strings.Replace(createdBy, "@", "_", 1) | |||
There was a problem hiding this comment.
这里考虑下将来 username中可能会带'@'，比如使用email作为username
jessehu
changed the title
jessehu
approved these changes
Dec 7, 2023
jessehu
reviewed
Dec 7, 2023
| return createdBy | ||
| } | ||
|
|
||
| // last `@` replaced with `_`. |
There was a problem hiding this comment.
func 已经有说明使用 ${Tower username}_${Tower auth_config_id} 这种格式。Annotation 也有说明使用 @ 间隔。
There was a problem hiding this comment.
// last @ replaced with _. 只说了 做什么，没说为什么要做
There was a problem hiding this comment.
或者你在Func comment中补充下 createdBy string是什么格式
jessehu
reviewed
Dec 7, 2023
pkg/service/util.go
Outdated
| // The owner can be in one of the following two formats: | ||
| // 1. ${Tower username}_${Tower auth_config_id}, e.g. caas.smartx_7e98ecbb-779e-43f6-8330-1bc1d29fffc7. | ||
| // 2. ${Tower username}, e.g. root. If auth_config_id is not set, it means it is a LOCAL user. | ||
| func parseOwnerFromCreatedBy(createdBy string) string { |
There was a problem hiding this comment.
改个名称：parseOwnerFromCreatedByAnnotation()
jessehu
approved these changes
Dec 7, 2023
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.
Issue SKS-2194
支持指定集群和节点虚拟机的所属用户。
Change
ElfCluster 支持设置 CreatedByAnnotation 注解，在创建虚拟机的时候使用 CreatedByAnnotation 设置 Owner。
CreatedByAnnotation 支持以下两种方式的值：
Test
没有设置 CreatedByAnnotation
ksc 和 elfCluster 没有设置 CreatedByAnnotation，观察到创建出来的虚拟机也没有设置 Owner
设置 CreatedByAnnotation，且值为 ${Tower username}@${Tower auth_config_id} 格式
ksc 和 elfCluster 没有设置 CreatedByAnnotation 为 haijian.yang@d8dc20fc-e197-41da-83b6-c903c88663fd，观察到创建出来的虚拟机带上了指定的 Owner