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.

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

Remove client side validation for azure network plugin #1798

Merged
merged 3 commits into from
Aug 21, 2018
Merged

Remove client side validation for azure network plugin #1798

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a67eb92
:bug: (Network profile of AKS.) Remove client side validation for azu…
metacpp Aug 20, 2018
2c6a5cf
:memo: (Network profile of AKS.) Add more explainations for network_p…
metacpp Aug 20, 2018
b03d657
Updating to better match the other docs
tombuildsstuff Aug 21, 2018
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: 0 additions & 6 deletions azurerm/resource_arm_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ func resourceArmKubernetesCluster() *schema.Resource {
return nil
}

podCidr := profile["pod_cidr"].(string)

if networkPlugin == "azure" && podCidr != "" {
return fmt.Errorf("The `pod_cidr` field in the `network_profile` block can not be specified when `network_plugin` is set to `azure`. Please remove `pod_cidr` or set `network_plugin` to `kubenet`.")
}

dockerBridgeCidr := profile["docker_bridge_cidr"].(string)
dnsServiceIP := profile["dns_service_ip"].(string)
serviceCidr := profile["service_cidr"].(string)
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/kubernetes_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ The following arguments are supported:
* `kubernetes_version` - (Optional) Version of Kubernetes specified when creating the AKS managed cluster. If not specified, the latest recommended version will be used at provisioning time (but won't auto-upgrade).

* `network_profile` - (Optional) A Network Profile block as documented below.
-> **NOTE:** If `network_profile` is not defined, `kubenet` profile will be used by default.

* `tags` - (Optional) A mapping of tags to assign to the resource.

Expand Down Expand Up @@ -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


Here's an example of configuring the `kubenet` Networking Profile:

Expand Down