Skip to content

{AKS} az aks update: force --network-policy=cilium whenever --network-dataplane=cilium #7011

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.

Sign up for GitHub

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

Merged
yanzhudd merged 2 commits into from
Nov 22, 2023
Merged

{AKS} az aks update: force --network-policy=cilium whenever --network-dataplane=cilium #7011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f117a4b
force --network-policy=cilium whenever --network-dataplane=cilium dur…
Nov 20, 2023
d86c0d8
force network-policy cilium when it is not explicitly set + add comments
Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/aks-preview/azext_aks_preview/managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
CONST_NETWORK_PLUGIN_AZURE,
CONST_NETWORK_PLUGIN_MODE_OVERLAY,
CONST_NETWORK_DATAPLANE_CILIUM,
CONST_NETWORK_POLICY_CILIUM,
CONST_PRIVATE_DNS_ZONE_NONE,
CONST_PRIVATE_DNS_ZONE_SYSTEM,
CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
Expand Down Expand Up @@ -3436,6 +3437,11 @@ def update_network_plugin_settings(self, mc: ManagedCluster) -> ManagedCluster:
network_policy = self.context.get_network_policy()
if network_policy:
mc.network_profile.network_policy = network_policy
elif network_dataplane == CONST_NETWORK_DATAPLANE_CILIUM:
# force network_policy to "cilium" when network_dataplane is "cilium" to pass validation in aks rp
# this was needed because api version 2023-08-02preview introduced --network-policy=none
# without forcing network_policy to "cilium" here, when upgrading to cilium without specifying --network-policy, it will be set to none by default and validation in aks rp will fail.
mc.network_profile.network_policy = CONST_NETWORK_POLICY_CILIUM

return mc

Expand Down
2 changes: 2 additions & 0 deletions src/aks-preview/azext_aks_preview/tests/latest/test_managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5104,6 +5104,7 @@ def test_update_network_plugin_settings(self):
network_plugin="azure",
network_plugin_mode="overlay",
network_dataplane="cilium",
network_policy="",
pod_cidr="100.64.0.0/16",
service_cidr="192.168.0.0/16"
),
Expand All @@ -5121,6 +5122,7 @@ def test_update_network_plugin_settings(self):
network_plugin="azure",
network_plugin_mode="overlay",
network_dataplane="cilium",
network_policy="cilium",
pod_cidr="100.64.0.0/16",
service_cidr="192.168.0.0/16",
),
Expand Down