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

Add internal-network-name networking option #444

Merged
merged 2 commits into from
Jan 21, 2019
Merged

Add internal-network-name networking option #444

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
548037b
Add internal-network-name networking option
Jan 19, 2019
925065a
Add 'Networking' section to options documentation
Jan 21, 2019
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
22 changes: 22 additions & 0 deletions docs/provider-configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ to the OpenStack Cloud Provider.
- [Global](#global)
- [Global Required Parameters](#global-required-parameters)
- [Global Optional Parameters](#global-optional-parameters)
- [Networking](#networking)
- [Networking](#networking-optional-parameters)
- [Load Balancer](#load-balancer)
- [Load Balancer Optional Parameters](#load-balancer-optional-parameters)
- [Block Storage](#block-storage)
Expand Down Expand Up @@ -135,7 +137,27 @@ file.
* `Cloud`: Used to specify which named cloud in the clouds.yaml file that you want to use


#### Networking

These configuration options for the OpenStack provider pertain to the network
configuration and should appear in the `[Networking]` section of the `$CLOUD_CONFIG`
file.

##### Networking Optional Parameters

* `ipv6-support-disabled`: Indicates whether or not to use ipv6 addresses.
The default is `false`. When `true` is specified then will ignore any
ipv6 addresses assigned to the node.
* `public-network-name`: Used to specify external network.
The default is `public`. Must be a network name, not id.
* `internal-network-name`: Used to override internal network selection.
Where no value is provided automatic detection will select random node interface
as internal. This option makes sense and recommended to specify only
when you have more than one interface attached to kubernetes nodes.
Must be a network name, not id.

#### Load Balancer

These configuration options for the OpenStack provider pertain to the load
balancer and should appear in the `[LoadBalancer]` section of the `$CLOUD_CONFIG`
file.
Expand Down
8 changes: 7 additions & 1 deletion pkg/cloudprovider/providers/openstack/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ type BlockStorageOpts struct {
type NetworkingOpts struct {
IPv6SupportDisabled bool `gcfg:"ipv6-support-disabled"`
PublicNetworkName string `gcfg:"public-network-name"`
InternalNetworkName string `gcfg:"internal-network-name"`
}

// RouterOpts is used for Neutron routes
Expand Down Expand Up @@ -544,7 +545,12 @@ func nodeAddresses(srv *servers.Server, networkingOpts NetworkingOpts) ([]v1.Nod
if props.IPType == "floating" || network == networkingOpts.PublicNetworkName {
addressType = v1.NodeExternalIP
} else {
addressType = v1.NodeInternalIP
if networkingOpts.InternalNetworkName == "" || network == networkingOpts.InternalNetworkName {
addressType = v1.NodeInternalIP
} else {
klog.V(5).Infof("Node '%s' address '%s' ignored due to 'internal-network-name' option", srv.Name, props.Addr)
continue
}
}

isIPv6 := net.ParseIP(props.Addr).To4() == nil
Expand Down