-
Notifications
You must be signed in to change notification settings - Fork 208
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
enabled l7Proxy & removed err.log message for WireGuard #1419
enabled l7Proxy & removed err.log message for WireGuard #1419
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Some comment.
install/helm.go
Outdated
if k.params.NodeEncryption { | ||
k.Log("⚠️️ Wireguard does not support node encryption yet") | ||
} | ||
helmMapOpts["l7Proxy"] = "true" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we don't need to set any l7Proxy
here, as it should be enabled by default.
However, we need to figure out which version of Cilium we are trying to install. I.e., we need to keep the existing code for <1.14 versions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@brb Thanks for the review. That means I just need to implement a simple versioncheck ("<=1.13.0")
to restrict, right? 👇🏼
switch k.params.Encryption {
case encryptionIPsec:
helmMapOpts["encryption.enabled"] = "true"
helmMapOpts["encryption.type"] = "ipsec"
if k.params.NodeEncryption {
helmMapOpts["encryption.nodeEncryption"] = "true"
}
case encryptionWireguard:
helmMapOpts["encryption.enabled"] = "true"
helmMapOpts["encryption.type"] = "wireguard"
// TODO(gandro): Future versions of Cilium will remove the following
// two limitations, we will need to have set the config map values
// based on the installed Cilium version
if versioncheck.MustCompile("<=1.13.0")(k.chartVersion) {
helmMapOpts["l7Proxy"] = "false"
k.Log("ℹ️ L7 proxy disabled due to Wireguard encryption")
if k.params.NodeEncryption {
k.Log("⚠️️ Wireguard does not support node encryption yet")
}
}
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Could you squash all commit messages into a single one? Also, please no emojis in commit messages 😅
8b1a430
to
117668a
Compare
@brb done ✔️ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Close to merging. One more nit - could you remove the duplicates from your commit message?
enabled l7Proxy & removed err.log message for WireGuard
Signed-off-by: Pratyay Banerjee <putubanerjee23@gmail.com>
enabled l7Proxy & removed err.log message for WireGuard
Signed-off-by: Pratyay Banerjee <putubanerjee23@gmail.com>
enabled l7Proxy & removed err.log message for WireGuard
Signed-off-by: Pratyay Banerjee <putubanerjee23@gmail.com>
Signed-off-by: Pratyay Banerjee <putubanerjee23@gmail.com>
117668a
to
6ea9025
Compare
@brb Thanks for the catch. Everything should be fine now! 😄 |
There is a problem now, condition
Created an PR to fix this: #1529 |
Since cilium/cilium#19401 (to be released in v1.14) there's no need to disable the
L7 proxy
when WireGuard is enabled on the > v1.13 Cilium (the relevant log message L7 proxy disabled due to Wireguard encryption).Fixes #1405
cc: @brb
Signed-off-by: Pratyay Banerjee