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

Jump to bottom

[release-4.7] Bug 1929168: Kuryr: Always set worker_nodes_subnets #987

Merged
merged 1 commit into from Mar 2, 2021
Merged

[release-4.7] Bug 1929168: Kuryr: Always set worker_nodes_subnets #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions bindata/network/kuryr/003-config.yaml
View file
Open in desktop
Expand Up @@ -44,6 +44,9 @@ data:

endpoints_driver_octavia_provider = {{ default "default" .OctaviaProvider }}

[pod_vif_nested]
worker_nodes_subnets = {{ .WorkerNodesSubnets }}

[octavia_defaults]
member_mode = {{ default "L3" .OctaviaMemberMode }}
sg_mode = {{ default "update" .OctaviaSGMode }}
Expand Down
1 change: 1 addition & 0 deletions pkg/bootstrap/types.go
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ type KuryrBootstrapResult struct {
ServiceSubnet string
PodSubnetpool string
WorkerNodesRouter string
WorkerNodesSubnets []string
NodesNetworkMTU int
PodSecurityGroups []string
ExternalNetwork string
Expand Down
1 change: 1 addition & 0 deletions pkg/network/kuryr.go
View file
Open in desktop
Expand Up @@ -47,6 +47,7 @@ func renderKuryr(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.BootstrapR
data.Data["ResourceTags"] = "openshiftClusterID=" + b.ClusterID
data.Data["PodSecurityGroups"] = strings.Join(b.PodSecurityGroups, ",")
data.Data["WorkerNodesRouter"] = b.WorkerNodesRouter
data.Data["WorkerNodesSubnets"] = strings.Join(b.WorkerNodesSubnets, ",")
data.Data["PodSubnetpool"] = b.PodSubnetpool
data.Data["ServiceSubnet"] = b.ServiceSubnet
data.Data["ExternalNetwork"] = b.ExternalNetwork
Expand Down
1 change: 1 addition & 0 deletions pkg/platform/openstack/kuryr_bootstrap.go
View file
Open in desktop
Expand Up @@ -703,6 +703,7 @@ func BootstrapKuryr(conf *operv1.NetworkSpec, kubeClient client.Client) (*bootst
ServiceSubnet: svcSubnetId,
PodSubnetpool: podSubnetpoolId,
WorkerNodesRouter: routerId,
WorkerNodesSubnets: []string{workerSubnet.ID},
NodesNetworkMTU: mtu,
PodSecurityGroups: []string{podSgId},
ExternalNetwork: externalNetwork,
Expand Down