Merge afad00e into 41828e5

nokia · Apr 16, 2020 · 3dd8ba9 · 3dd8ba9
2 parents 41828e5 + afad00e
commit 3dd8ba9
Show file tree

Hide file tree

Showing 28 changed files with 398 additions and 756 deletions.
diff --git a/cmd/netwatcher/netwatcher.go b/cmd/netwatcher/netwatcher.go
@@ -37,12 +37,12 @@ func main() {
     log.Println("ERROR: Parsing kubeconfig failed with error:" + err.Error() + " , exiting")
     os.Exit(-1)
   }
-  netWatcher, err := netcontrol.NewWatcher(config)
+  stopCh := make(chan struct{})
+  netWatcher, err := netcontrol.NewWatcher(config, &stopCh)
   if err != nil {
     log.Println("ERROR: Creation of NetWatcher failed with error:" + err.Error() + " , exiting")
     os.Exit(-1)
   }
-  stopCh := make(chan struct{})
   netWatcher.Run(&stopCh)
   select {}
 }
diff --git a/crd/client/clientset/versioned/clientset.go b/crd/client/clientset/versioned/clientset.go
diff --git a/crd/client/clientset/versioned/typed/danm/v1/clusternetwork.go b/crd/client/clientset/versioned/typed/danm/v1/clusternetwork.go
diff --git a/crd/client/clientset/versioned/typed/danm/v1/danmep.go b/crd/client/clientset/versioned/typed/danm/v1/danmep.go