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

Automated cherry pick of #54176 #54420

Merged
merged 1 commit into from Oct 25, 2017
Merged

Automated cherry pick of #54176 #54420

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
1 change: 1 addition & 0 deletions pkg/cloudprovider/providers/openstack/openstack.go
View file
Open in desktop
Expand Up @@ -83,6 +83,7 @@ type LoadBalancerOpts struct {
SubnetId string `gcfg:"subnet-id"` // overrides autodetection.
FloatingNetworkId string `gcfg:"floating-network-id"` // If specified, will create floating ip for loadbalancer, or do not create floating ip.
LBMethod string `gcfg:"lb-method"` // default to ROUND_ROBIN.
LBProvider string `gcfg:"lb-provider"`
CreateMonitor bool `gcfg:"create-monitor"`
MonitorDelay MyDuration `gcfg:"monitor-delay"`
MonitorTimeout MyDuration `gcfg:"monitor-timeout"`
Expand Down
1 change: 1 addition & 0 deletions pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file
Open in desktop
Expand Up @@ -513,6 +513,7 @@ func (lbaas *LbaasV2) createLoadBalancer(service *v1.Service, name string, inter
Name: name,
Description: fmt.Sprintf("Kubernetes external service %s", name),
VipSubnetID: lbaas.opts.SubnetId,
Provider: lbaas.opts.LBProvider,
}

loadBalancerIP := service.Spec.LoadBalancerIP
Expand Down
1 change: 1 addition & 0 deletions pkg/cloudprovider/providers/openstack/openstack_test.go
View file
Open in desktop
Expand Up @@ -162,6 +162,7 @@ func TestCheckOpenStackOpts(t *testing.T) {
SubnetId: "6261548e-ffde-4bc7-bd22-59c83578c5ef",
FloatingNetworkId: "38b8b5f9-64dc-4424-bf86-679595714786",
LBMethod: "ROUND_ROBIN",
LBProvider: "haproxy",
CreateMonitor: true,
MonitorDelay: delay,
MonitorTimeout: timeout,
Expand Down