Merge "Code cleanup"

2 files changed, 2 insertions, 6 deletions

diff --git a/cmd/ovn4nfvk8s-cni/ovn4nfvk8s-cni.go b/cmd/ovn4nfvk8s-cni/ovn4nfvk8s-cni.go
index dda42ad..7c90d02 100644
--- a/cmd/ovn4nfvk8s-cni/ovn4nfvk8s-cni.go
+++ b/cmd/ovn4nfvk8s-cni/ovn4nfvk8s-cni.go
@@ -20,7 +20,6 @@ import (
 	"github.com/containernetworking/cni/pkg/version"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	kexec "k8s.io/utils/exec"
 	"ovn4nfv-k8s-plugin/internal/pkg/kube"
 
 	"ovn4nfv-k8s-plugin/cmd/ovn4nfvk8s-cni/app"
@@ -269,9 +268,8 @@ func main() {
 	c.Version = "0.0.2"
 	c.Flags = config.Flags
 
-	exec := kexec.New()
 	c.Action = func(ctx *cli.Context) error {
-		if _, err := config.InitConfig(ctx, exec, nil); err != nil {
+		if _, err := config.InitConfig(ctx); err != nil {
 			return err
 		}
 
diff --git a/cmd/ovn4nfvk8s/ovn4nfvk8s.go b/cmd/ovn4nfvk8s/ovn4nfvk8s.go
index d097558..0c0cc2e 100644
--- a/cmd/ovn4nfvk8s/ovn4nfvk8s.go
+++ b/cmd/ovn4nfvk8s/ovn4nfvk8s.go
@@ -22,7 +22,6 @@ func main() {
 	c := cli.NewApp()
 	c.Name = "ovn4nfvk8s"
 	c.Usage = "run ovn4nfvk8s to start pod watchers"
-	c.Version = config.Version
 	c.Flags = append([]cli.Flag{
 		// Daemon file
 		cli.StringFlag{
@@ -50,9 +49,8 @@ func delPidfile(pidfile string) {
 }
 
 func runOvnKube(ctx *cli.Context) error {
-	fmt.Println("ovn4nfvk8s started")
 	exec := kexec.New()
-	_, err := config.InitConfig(ctx, exec, nil)
+	_, err := config.InitConfig(ctx)
 	if err != nil {
 		return err
 	}