Skip to content

Commit f7a50d4

Browse files
committed
Fixes #213 fix panic on start when seclists aren't managed
1 parent 75c5e87 commit f7a50d4

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

pkg/oci/ccm.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ func (cp *CloudProvider) Initialize(clientBuilder controller.ControllerClientBui
145145
if !cache.WaitForCacheSync(wait.NeverStop, serviceInformer.Informer().HasSynced) {
146146
utilruntime.HandleError(fmt.Errorf("Timed out waiting for service informer to sync"))
147147
}
148-
149148
}
150-
cp.securityListManager = newSecurityListManager(cp.client, serviceInformer.Lister(), cp.config.LoadBalancer.SecurityLists, cp.config.LoadBalancer.SecurityListManagementMode)
149+
150+
cp.securityListManager = newSecurityListManager(cp.client, serviceInformer, cp.config.LoadBalancer.SecurityLists, cp.config.LoadBalancer.SecurityListManagementMode)
151151
}
152152
}
153153

pkg/oci/load_balancer_security_lists.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
api "k8s.io/api/core/v1"
2929
labels "k8s.io/apimachinery/pkg/labels"
3030
sets "k8s.io/apimachinery/pkg/util/sets"
31+
informersv1 "k8s.io/client-go/informers/core/v1"
3132
listersv1 "k8s.io/client-go/listers/core/v1"
3233
apiservice "k8s.io/kubernetes/pkg/api/v1/service"
3334

@@ -81,15 +82,19 @@ type baseSecurityListManager struct {
8182
securityLists map[string]string
8283
}
8384

84-
func newSecurityListManager(client client.Interface, serviceLister listersv1.ServiceLister, securityLists map[string]string, mode string) securityListManager {
85+
func newSecurityListManager(client client.Interface, serviceInformer informersv1.ServiceInformer, securityLists map[string]string, mode string) securityListManager {
8586
if securityLists == nil {
8687
securityLists = make(map[string]string)
8788
}
8889
baseMgr := baseSecurityListManager{
8990
client: client,
90-
serviceLister: serviceLister,
9191
securityLists: securityLists,
9292
}
93+
94+
if mode != ManagementModeNone {
95+
baseMgr.serviceLister = serviceInformer.Lister()
96+
}
97+
9398
switch mode {
9499
case ManagementModeFrontend:
95100
glog.Infof("Security list management mode: %q. Managing frontend security lists only.", ManagementModeFrontend)

0 commit comments

Comments
 (0)