From a78fc5926d6091fcae9df2ccac3a5a3182832ce4 Mon Sep 17 00:00:00 2001 From: Jesse Haka Date: Tue, 3 Jul 2018 23:24:24 +0300 Subject: [PATCH 1/2] if loadbalancer section is not defined in cloudconfig, do not initialize lb support use reflect because structs with []string cannot be compared --- pkg/cloudprovider/providers/openstack/openstack.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index 5f2e6925cbb..f57d664087d 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -27,6 +27,7 @@ import ( "net/http" "os" "regexp" + "reflect" "strings" "time" @@ -573,6 +574,11 @@ func (os *OpenStack) HasClusterID() bool { func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) { glog.V(4).Info("openstack.LoadBalancer() called") + if reflect.DeepEqual(os.lbOpts, LoadBalancerOpts{}) { + glog.V(4).Info("LoadBalancer section is empty/not defined in cloud-config") + return nil, false + } + network, err := os.NewNetworkV2() if err != nil { return nil, false From 955d2c2dc26f2254b6bf8dd9cdb87e817debb829 Mon Sep 17 00:00:00 2001 From: Jesse Haka Date: Wed, 4 Jul 2018 08:46:41 +0300 Subject: [PATCH 2/2] fix gofmt --- pkg/cloudprovider/providers/openstack/openstack.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index f57d664087d..9b3a7d3272d 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -26,8 +26,8 @@ import ( "net" "net/http" "os" - "regexp" "reflect" + "regexp" "strings" "time"