kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OpenStack: Add OCCM address sort order config 

This will add the OCCM config to specify an address sort order:
* https://github.com/kubernetes/cloud-provider-openstack/pull/1946
This commit is contained in:
ederst 2023-03-24 11:34:22 +01:00
parent f2f28e4cde
commit 1e9fc8e6d5
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/kops/componentconfig.go
View File

@ -817,6 +817,7 @@ type OpenstackNetwork struct {
IPv6SupportDisabled *bool `json:"ipv6SupportDisabled,omitempty"`
PublicNetworkNames []*string `json:"publicNetworkNames,omitempty"`
InternalNetworkNames []*string `json:"internalNetworkNames,omitempty"`
AddressSortOrder *string `json:"addressSortOrder,omitempty"`
}
// OpenstackMetadata defines config for metadata service related settings

1
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -823,6 +823,7 @@ type OpenstackNetwork struct {
IPv6SupportDisabled *bool `json:"ipv6SupportDisabled,omitempty"`
PublicNetworkNames []*string `json:"publicNetworkNames,omitempty"`
InternalNetworkNames []*string `json:"internalNetworkNames,omitempty"`
AddressSortOrder *string `json:"addressSortOrder,omitempty"`
}
// OpenstackMetadata defines config for metadata service related settings

1
pkg/apis/kops/v1alpha3/componentconfig.go
View File

@ -814,6 +814,7 @@ type OpenstackNetwork struct {
IPv6SupportDisabled *bool `json:"ipv6SupportDisabled,omitempty"`
PublicNetworkNames []*string `json:"publicNetworkNames,omitempty"`
InternalNetworkNames []*string `json:"internalNetworkNames,omitempty"`
AddressSortOrder *string `json:"addressSortOrder,omitempty"`
}
// OpenstackMetadata defines config for metadata service related settings

3
upup/pkg/fi/cloudup/openstack/cloud.go
View File

@ -906,6 +906,9 @@ func MakeCloudConfig(spec kops.ClusterSpec) []string {
for _, name := range networking.InternalNetworkNames {
networkingLines = append(networkingLines, fmt.Sprintf("internal-network-name=%s", fi.ValueOf(name)))
}
if networking.AddressSortOrder != nil {
networkingLines = append(networkingLines, fmt.Sprintf("address-sort-order=%s", fi.ValueOf(networking.AddressSortOrder)))
}
if len(networkingLines) > 0 {
lines = append(lines, "[Networking]")