Skip to content

Fix MT NEG controller panic, caused by AddEventHandler on a nil nodeTopologyInformer #2929

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

Fix MT NEG controller panic, caused by AddEventHandler on a nil nodeTopologyInformer #2929

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmd/glbc/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ func main() {
}
var nodeTopologyFactory informernodetopology.SharedInformerFactory
if nodeTopologyClient != nil {
nodeTopologyFactory = informernodetopology.NewSharedInformerFactory(nodeTopologyClient, flags.F.ResyncPeriod)
nodeTopologyFactory = informernodetopology.NewSharedInformerFactoryWithOptions(nodeTopologyClient, flags.F.ResyncPeriod, informernodetopology.WithTweakListOptions(func(listOptions *metav1.ListOptions) {
listOptions.FieldSelector = fmt.Sprintf("metadata.name=%s", flags.F.NodeTopologyCRName)
}))
}
if flags.F.LeaderElection.LeaderElect {
err := multiprojectstart.StartWithLeaderElection(
Expand Down
5 changes: 3 additions & 2 deletions pkg/multiproject/neg/neg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ func StartNEGController(
informers.providerConfigFilteredSvcNegInformer,
informers.providerConfigFilteredNetworkInformer,
informers.providerConfigFilteredGkeNetworkParamsInformer,
informers.providerConfigFilteredNodeTopologyInformer,
hasSynced,
cloud,
zoneGetter,
Expand Down Expand Up @@ -253,6 +254,7 @@ func createNEGController(
svcNegInformer cache.SharedIndexInformer,
networkInformer cache.SharedIndexInformer,
gkeNetworkParamsInformer cache.SharedIndexInformer,
nodeTopologyInformer cache.SharedIndexInformer,
hasSynced func() bool,
cloud *gce.Cloud,
zoneGetter *zonegetter.ZoneGetter,
Expand All @@ -271,7 +273,6 @@ func createNEGController(
}

noDefaultBackendServicePort := utils.ServicePort{}
var noNodeTopologyInformer cache.SharedIndexInformer

negController, err := neg.NewController(
kubeClient,
Expand All @@ -286,7 +287,7 @@ func createNEGController(
svcNegInformer,
networkInformer,
gkeNetworkParamsInformer,
noNodeTopologyInformer,
nodeTopologyInformer,
hasSynced,
l4Namer,
noDefaultBackendServicePort,
Expand Down