Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
DOCUMENTATION: Fix Documented Default Value for clusterSubnet (#3474)
Browse files Browse the repository at this point in the history 
* Fix Documented Default Value for clusterSubnet

This commit corrects the default value listed in the documentation for
clusterSubnet.

* get rid of confusing VNET Integration language
  • Loading branch information
@apeschel @jackfrancis
apeschel authored and jackfrancis committed Jul 25, 2018
1 parent 0c87623 commit a47fb4b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions docs/clusterdefinition.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Here are the valid values for the orchestrator types:
| addons | no | Configure various Kubernetes addons configuration (currently supported: tiller, kubernetes-dashboard). See `addons` configuration below |
| apiServerConfig | no | Configure various runtime configuration for apiserver. See `apiServerConfig` [below](#feat-apiserver-config) |
| cloudControllerManagerConfig | no | Configure various runtime configuration for cloud-controller-manager. See `cloudControllerManagerConfig` [below](#feat-cloud-controller-manager-config) |
| clusterSubnet | no | The IP subnet used for allocating IP addresses for pod network interfaces. The subnet must be in the VNET address space. Default value is 10.244.0.0/16 |
| clusterSubnet | no | The IP subnet used for allocating IP addresses for pod network interfaces. The subnet must be in the VNET address space. With Azure CNI enabled, the default value is 10.240.0.0/12. Without Azure CNI, the default value is 10.244.0.0/16. |
| containerRuntime | no | The container runtime to use as a backend. The default is `docker`. The other options are `clear-containers`, `kata-containers`, and `containerd` |
| controllerManagerConfig | no | Configure various runtime configuration for controller-manager. See `controllerManagerConfig` [below](#feat-controller-manager-config) |
| customWindowsPackageURL | no | Configure custom windows Kubernetes release package URL for deployment on Windows |
Expand Down Expand Up @@ -260,7 +260,7 @@ Below is a list of controller-manager options that are _not_ currently user-conf
| ------------------------------------ | ------------------------------------------------------- |
| "--kubeconfig" | "/var/lib/kubelet/kubeconfig" |
| "--allocate-node-cidrs" | "false" |
| "--cluster-cidr" | "10.240.0.0/12" |
| "--cluster-cidr" | _uses clusterSubnet value_ |
| "--cluster-name" | _auto-generated using api model properties_ |
| "--cloud-provider" | "azure" |
| "--cloud-config" | "/etc/kubernetes/azure.json" |
Expand Down Expand Up @@ -301,7 +301,7 @@ Below is a list of cloud-controller-manager options that are _not_ currently use
| ------------------------- | ------------------------------------------- |
| "--kubeconfig" | "/var/lib/kubelet/kubeconfig" |
| "--allocate-node-cidrs" | "false" |
| "--cluster-cidr" | "10.240.0.0/12" |
| "--cluster-cidr" | _uses clusterSubnet value_ |
| "--cluster-name" | _auto-generated using api model properties_ |
| "--cloud-provider" | "azure" |
| "--cloud-config" | "/etc/kubernetes/azure.json" |
Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ func setOrchestratorDefaults(cs *api.ContainerService) {
}
if o.KubernetesConfig.ClusterSubnet == "" {
if o.IsAzureCNI() {
// When VNET integration is enabled, all masters, agents and pods share the same large subnet.
// When Azure CNI is enabled, all masters, agents and pods share the same large subnet.
o.KubernetesConfig.ClusterSubnet = DefaultKubernetesSubnet
} else {
o.KubernetesConfig.ClusterSubnet = DefaultKubernetesClusterSubnet
Expand Down

0 comments on commit a47fb4b

Please sign in to comment.