Skip to content
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

Remove client side validation for azure network plugin #1798

Merged
merged 3 commits into from
Aug 21, 2018

Conversation

metacpp
Copy link
Contributor

@metacpp metacpp commented Aug 20, 2018

This PR removes the validation logic to handle non-empty pod_cidr while network_plugin is azure, coz it causes #1783 .

Actually, AKS team added the below logic to reject non-empty pod_cidr explicitly to avoid confusing the Terraform Plan:
Please see Azure/acs-engine#3562 for details.

For some reason, the fix is not deployed successfully, I am working with AKS team to get it work correctly.

Acceptance Test Results:

=== RUN   TestAccAzureRMKubernetesCluster_basic
--- PASS: TestAccAzureRMKubernetesCluster_basic (1220.45s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_addonProfileRouting
--- PASS: TestAccAzureRMKubernetesCluster_addonProfileRouting (1347.21s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_advancedNetworkingKubenet
--- PASS: TestAccAzureRMKubernetesCluster_advancedNetworkingKubenet (1384.35s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_importBasic
--- PASS: TestAccAzureRMKubernetesCluster_importBasic (1407.42s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_addonProfileOMS
--- PASS: TestAccAzureRMKubernetesCluster_addonProfileOMS (1424.06s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_advancedNetworkingAzure
--- PASS: TestAccAzureRMKubernetesCluster_advancedNetworkingAzure (1556.93s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_advancedNetworkingAzureComplete
--- PASS: TestAccAzureRMKubernetesCluster_advancedNetworkingAzureComplete (1565.04s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_advancedNetworkingKubenetComplete
--- PASS: TestAccAzureRMKubernetesCluster_advancedNetworkingKubenetComplete (1576.40s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_internalNetwork
--- PASS: TestAccAzureRMKubernetesCluster_internalNetwork (1757.12s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_upgradeConfig
--- PASS: TestAccAzureRMKubernetesCluster_upgradeConfig (1907.46s)
PASS
=== RUN   TestAccAzureRMKubernetesCluster_addAgent
--- PASS: TestAccAzureRMKubernetesCluster_addAgent (1969.38s)
PASS
ok    ../azurerm/test-azurerm    1969.453s

Synced with AKS team, the fix is planned for v0.21.0-rc1:
Azure/acs-engine@1321003

…etwork plugin.

Non-empty podCidr string validation for azure network plugin should be handled by ASK service.
Add more explainations on default network_profile and `azure` specific validation requirement.
@metacpp metacpp modified the milestones: 1.14.0, Soon Aug 20, 2018
@metacpp metacpp self-assigned this Aug 20, 2018
Copy link
Contributor

@tombuildsstuff tombuildsstuff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor documentation issue but this otherwise LGTM 👍

@@ -266,6 +267,7 @@ A `network_profile` block supports the following:
* `docker_bridge_cidr` - (Optional) IP address (in CIDR notation) used as the Docker bridge IP address on nodes. This is required when `network_plugin` is set to `kubenet`. Changing this forces a new resource to be created.

* `pod_cidr` - (Optional) The CIDR to use for pod IP addresses. Changing this forces a new resource to be created.
-> **NOTE:** When `network_plugin` is set to `azure` - the `pod_cidr` filed should be ignored.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we normally integrate this into the field description e.g.

* `pod_cidr` - (Optional) The CIDR to use for pod IP addresses. This field can only be set when `network_plugin` is set to `kubenet`. Changing this forces a new resource to be created.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a commit to fix this, since this is minor

@tombuildsstuff tombuildsstuff merged commit 42db686 into master Aug 21, 2018
@tombuildsstuff tombuildsstuff deleted the podCidr_fix branch August 21, 2018 07:13
tombuildsstuff added a commit that referenced this pull request Aug 21, 2018
torresdal added a commit to torresdal/terraform-provider-azurerm that referenced this pull request Aug 23, 2018
* master: (95 commits)
  Some more AzureStack changes for route table resource and datasource (hashicorp#1807)
  backport AzureStack route resource PR comments (hashicorp#1810)
  Updating to include hashicorp#1799
  Bug Fix of azurerm_virtual_machine.storage_os_disk.image_uri (hashicorp#1799)
  Updating to include hashicorp#1693
  IoT Hub add endpoints and routes (hashicorp#1693)
  Updating to include hashicorp#1789
  Added support for EventHub compatible EndPoints and Paths (hashicorp#1789)
  Updating to include hashicorp#1798
  Remove client side validation for azure network plugin (hashicorp#1798)
  backport azure stack route_table PR review comments (hashicorp#1790)
  Update CHAGELOG.md to include hashicorp#1795
  Fix: Corrected regexp for eventhub name
  reset verb
  fix some pointer dereferences
  Fix indentation on application_gateway.html.markdown (hashicorp#1780)
  folded subscription and [az]schema packages into azure
  consolidate CaseDifference Supression functions
  Cleanup after v1.13.0 release
  v1.13.0
  ...
@tombuildsstuff tombuildsstuff modified the milestones: Soon, Being Sorted Oct 25, 2018
@ghost
Copy link

ghost commented Mar 6, 2019

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 [email protected]. Thanks!

@ghost ghost locked and limited conversation to collaborators Mar 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants