Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2363 from erikwilson/netpol-informers

Browse Source 
Add event handlers to network policy controller
This commit is contained in:
Erik Wilson 2020-10-12 08:53:39 -07:00 committed by GitHub
commit 114b5ccad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/agent/netpol/network_policy_controller.go
View File

@ -1683,6 +1683,10 @@ func NewNetworkPolicyController(
npInformer := informerFactory.Networking().V1().NetworkPolicies().Informer()
informerFactory.Start(stopCh)
if err := CacheSyncOrTimeout(informerFactory, stopCh, 1*time.Minute); err != nil {
return nil, errors.New("Failed to synchronize cache: " + err.Error())
}
// if config.MetricsEnabled {
// //Register the metrics for this controller
// prometheus.MustRegister(metrics.ControllerIPtablesSyncTime)
@ -1726,12 +1730,15 @@ func NewNetworkPolicyController(
npc.podLister = podInformer.GetIndexer()
npc.PodEventHandler = npc.newPodEventHandler()
podInformer.AddEventHandler(npc.PodEventHandler)
npc.nsLister = nsInformer.GetIndexer()
npc.NamespaceEventHandler = npc.newNamespaceEventHandler()
nsInformer.AddEventHandler(npc.NamespaceEventHandler)
npc.npLister = npInformer.GetIndexer()
npc.NetworkPolicyEventHandler = npc.newNetworkPolicyEventHandler()
npInformer.AddEventHandler(npc.NetworkPolicyEventHandler)
return &npc, nil
}

18
pkg/agent/netpol/utils.go
View File

@ -12,8 +12,10 @@ import (
"net"
"os/exec"
"strings"
"time"
apiv1 "k8s.io/api/core/v1"
"k8s.io/client-go/informers"
)
var (
@ -537,3 +539,19 @@ func GetNodeIP(node *apiv1.Node) (net.IP, error) {
}
return nil, errors.New("host IP unknown")
}
// CacheSync performs cache synchronization under timeout limit
func CacheSyncOrTimeout(informerFactory informers.SharedInformerFactory, stopCh <-chan struct{}, cacheSyncTimeout time.Duration) error {
syncOverCh := make(chan struct{})
go func() {
informerFactory.WaitForCacheSync(stopCh)
close(syncOverCh)
}()
select {
case <-time.After(cacheSyncTimeout):
return errors.New(cacheSyncTimeout.String() + " timeout")
case <-syncOverCh:
return nil
}
}