feat: Edit hostNetwork through the k8s property #1772
Merged
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
yangkaa
reviewed
Oct 27, 2023
event/manager.go
Outdated
| //server: end.URL, | ||
| //暂时 rbd-eventlog-agent:6366 | ||
| //server: option.Config.EventLogServer[0] + ":6363", | ||
| server: "rbd-eventlog-agent:6366", |
yangkaa
reviewed
Oct 27, 2023
| @@ -51,6 +51,8 @@ func (c *Dis) discoverEventServer() { | |||
| var servers []string | |||
| for _, en := range re.List { | |||
| if en.URL != "" { | |||
| // rbd-eventlog-agent:6363 | |||
| en.URL = option.Config.EventLogServer[0] + ":6363" | |||
yangkaa
reviewed
Oct 27, 2023
yangkaa
reviewed
Oct 27, 2023
| server := getTCPConnConfig(s.serviceID, s.config["stream-server"]) | ||
| if server == s.writer.server { | ||
| // TODO:bug |
yangkaa
reviewed
Oct 27, 2023
| return getLogAddress(cluster) | ||
| //return getLogAddress(cluster) | ||
| //rbd-eventlog-agent:6362 | ||
| return option.Config.EventLogServer[0] + ":6362" |
yangkaa
reviewed
Oct 27, 2023
worker/appm/conversion/version.go
Outdated
| //HostNetwork: func() bool { | ||
| // if _, ok := as.ExtensionSet["hostnetwork"]; ok { | ||
| // return true | ||
| // } |
There was a problem hiding this comment.
没有用的注释删除掉，但是建议这部分做个兼容，避免低版本rainbond 用户已经使用了这个环境变量，发布的模版在新版本无法正常使用
yangkaa
reviewed
Oct 28, 2023
yangkaa
reviewed
Oct 28, 2023
worker/appm/conversion/version.go
Outdated
| @@ -155,6 +156,11 @@ func TenantServiceVersion(as *v1.AppService, dbmanager db.Manager) error { | |||
| HostIPC: createHostIPC(as, dbmanager), | |||
| }, | |||
| } | |||
| // 如果参数配置了IsHostNetwork,那么使用k8s属性去修改 | |||
| var s *option.Worker | |||
| if s.Config.IsHostNetwork { | |||
There was a problem hiding this comment.
增加了全局的 hostNetwork 变量是干嘛的呢？设置这个参数，让 worker 生成的所有pod全部使用 hostNetwork 模式？
There was a problem hiding this comment.
目的是做个兼容，如果新版本，需要用k8s属性的模式去改hostNetwork,就设置IsHostNetwork = true，否则默认IsHostNetwork = false，使用环境变量的方式去改hostNetwork。这里命名不是很规范，“IsHostNetwork”有歧义，稍后修改更详细一点。
yangkaa
reviewed
Oct 28, 2023
yangkaa
reviewed
Oct 28, 2023
yangkaa
reviewed
Oct 28, 2023
cmd/node/option/conf.go
Outdated
| fs.StringVar(&a.RuntimeEndpoint, "runtime-endpoint", sources.RuntimeEndpointContainerd, "container runtime endpoint") | ||
| // rbd-eventlog service | ||
| fs.StringVar(&a.EventServer, "event-server", "", "service name of event-server") | ||
| fs.StringVar(&a.LogAddress, "log-address", "", "service name of log-address") |
There was a problem hiding this comment.
你新增的这两个参数有啥区别呢，在参数说明里，能否给出配置示例
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
zxwsclcmxbh
changed the title
Signed-off-by: banghao <[email protected]>
Signed-off-by: banghao <[email protected]>
zxwsclcmxbh
changed the title
Signed-off-by: banghao <[email protected]>
yangkaa
approved these changes
Oct 30, 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.
No description provided.