Support for Azure CNI Cilium #398
Conversation
|
@microsoft-github-policy-service agree |
|
Please run the tests locally as described in the Readme: |
main.tf
Outdated
| error_message = "When ebpf_data_plane is set to cilium, the network_plugin field can only be set to azure." | ||
| } | ||
| precondition { | ||
| condition = !(var.ebpf_data_plane == "cilium") || (var.network_plugin_mode == "Overlay" && var.pod_subnet_id == null || var.network_plugin_mode == null && var.pod_subnet_id != null) |
There was a problem hiding this comment.
According to the message, I think we can simplify the condition to:
condition = (var.ebpf_data_plane != "cilium") || (var.network_plugin_mode == "Overlay" || var.pod_subnet_id != null)There was a problem hiding this comment.
Slightly modified, to still comply to 'one of either'
variables.tf
Outdated
| variable "ebpf_data_plane" { | ||
| type = string | ||
| default = null | ||
| description = "(Optional) Specifies the eBPF data plane used for building the Kubernetes network." |
There was a problem hiding this comment.
Description could be
(Optional) Specifies the eBPF data plane used for building the Kubernetes network. Possible value is `cilium`. Changing this forces a new resource to be created.
There was a problem hiding this comment.
Agree, modified :)
main.tf
Outdated
| @@ -483,6 +484,14 @@ resource "azurerm_kubernetes_cluster" "main" { | |||
| condition = var.network_plugin_mode != "Overlay" || var.network_plugin == "azure" | |||
| error_message = "When network_plugin_mode is set to Overlay, the network_plugin field can only be set to azure." | |||
| } | |||
| precondition { | |||
| condition = !(var.ebpf_data_plane == "cilium" && var.network_plugin != "azure") | |||
There was a problem hiding this comment.
Could we simplify the condition to var.ebpf_data_plan != "cilium" || var.network_plugin == "azure"?
There was a problem hiding this comment.
Agree, modified :)
main.tf
Outdated
| error_message = "When ebpf_data_plane is set to cilium, the network_plugin field can only be set to azure." | ||
| } | ||
| precondition { | ||
| condition = (var.ebpf_data_plane != "cilium") || (var.network_plugin_mode == "Overlay" && var.pod_subnet_id == null || var.pod_subnet_id != null && var.network_plugin_mode == null) |
There was a problem hiding this comment.
You can have var.network_plugin_mode == "Overlay" and specify a value for example var.pod_subnet_id == 10.100.0.0/16. This is a valid configuration with Cilium but the current precondition would not allow it.
Can you please double check ?
Would it work this one? :
(var.ebpf_data_plane != "cilium") || var.network_plugin_mode == "Overlay" || var.pod_subnet_id != null
Also here you are just checking var.pod_subnet_id for the default node pool, but the additional nodepools are not part for the precondition
There was a problem hiding this comment.
Yes, I updated the precondition.
* Support for Azure CNI Cilium
Describe your changes
Support for Azure CNI - Cilium
Azure CNI powered by Cilium in now generally available.
Cilium is a comprehensive networking solution that combines the control plane of Azure CNI with the dataplane capabilities of Cilium.
Issue number
Closes #397
Checklist before requesting a review
CHANGELOG.mdfile