modify webhook img to independent image (#1442)

kubeovn · Apr 14, 2022 · 9bec51b · 9bec51b
1 parent e1d6dbf
commit 9bec51b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 .DS_Store
 dist/images/kube-ovn
 dist/images/kube-ovn-cmd
+dist/images/kube-ovn-webhook
 test/e2e/ovnnb_db.*
 test/e2e/ovnsb_db.*
 kube-ovn.yaml

diff --git a/Makefile b/Makefile
@@ -15,11 +15,13 @@ build-go:
 	go mod tidy
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn -ldflags $(GOLDFLAGS) -v ./cmd/cni
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-cmd -ldflags $(GOLDFLAGS) -v ./cmd
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-webhook -ldflags $(GOLDFLAGS) -v ./cmd/webhook
 
 .PHONY: build-go-arm
 build-go-arm:
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn -ldflags $(GOLDFLAGS) -v ./cmd/cni
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-cmd -ldflags $(GOLDFLAGS) -v ./cmd
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-webhook -ldflags $(GOLDFLAGS) -v ./cmd/webhook
 
 .PHONY: build-bin
 build-bin:

diff --git a/cmd/cmdmain.go b/cmd/cmdmain.go
@@ -12,7 +12,6 @@ import (
 	"github.com/kubeovn/kube-ovn/cmd/ovn_monitor"
 	"github.com/kubeovn/kube-ovn/cmd/pinger"
 	"github.com/kubeovn/kube-ovn/cmd/speaker"
-	"github.com/kubeovn/kube-ovn/cmd/webhook"
 )
 
 const (
@@ -21,7 +20,6 @@ const (
 	CmdMonitor               = "kube-ovn-monitor"
 	CmdPinger                = "kube-ovn-pinger"
 	CmdSpeaker               = "kube-ovn-speaker"
-	CmdWebHook               = "kube-ovn-webhook"
 	CmdControllerHealthCheck = "kube-ovn-controller-healthcheck"
 )
 
@@ -39,8 +37,6 @@ func main() {
 		pinger.CmdMain()
 	case CmdSpeaker:
 		speaker.CmdMain()
-	case CmdWebHook:
-		webhook.CmdMain()
 	case CmdControllerHealthCheck:
 		controller_health_check.CmdMain()
 	default:

diff --git a/cmd/webhook/server.go b/cmd/webhook/server.go
@@ -1,4 +1,4 @@
-package webhook
+package main
 
 import (
 	"flag"
@@ -37,7 +37,7 @@ func init() {
 	}
 }
 
-func CmdMain() {
+func main() {
 	var port int
 	klog.Infof(versions.String())
 

diff --git a/dist/images/Dockerfile b/dist/images/Dockerfile
@@ -11,10 +11,10 @@ WORKDIR /kube-ovn
 
 COPY kube-ovn /kube-ovn/kube-ovn
 COPY kube-ovn-cmd /kube-ovn/kube-ovn-cmd
+COPY kube-ovn-webhook /kube-ovn/kube-ovn-webhook
 RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-daemon && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-pinger && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-speaker && \
-    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-webhook && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller-healthcheck