Skip to content

Commit 534bd53

Browse files
committed
split kube-ovn-healthcheck into separate binary
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 903c532 commit 534bd53

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dist/images/kube-ovn
66
dist/images/kube-ovn-cmd
77
dist/images/kube-ovn-daemon
88
dist/images/kube-ovn-controller
9+
dist/images/kube-ovn-healthcheck
910
dist/images/kube-ovn-pinger
1011
dist/images/kube-ovn-webhook
1112
dist/windows/kube-ovn.exe

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ build-go:
118118
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-cmd -v ./cmd
119119
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-daemon -v ./cmd/daemon
120120
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-controller -v ./cmd/controller
121+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-healthcheck -v ./cmd/health_check
121122
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(GO_BUILD_FLAGS) -o $(CURDIR)/dist/images/test-server -v ./test/server
122123

123124
.PHONY: build-go-windows
@@ -132,6 +133,7 @@ build-go-arm:
132133
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-cmd -v ./cmd
133134
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-daemon -v ./cmd/daemon
134135
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-controller -v ./cmd/controller
136+
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build $(GO_BUILD_FLAGS) -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-healthcheck -v ./cmd/health_check
135137

136138
.PHONY: build-kube-ovn
137139
build-kube-ovn: build-debug build-go
@@ -1105,6 +1107,8 @@ kubectl-ko-log:
11051107
.PHONY: clean
11061108
clean:
11071109
$(RM) dist/images/kube-ovn dist/images/kube-ovn-cmd
1110+
$(RM) dist/images/kube-ovn-controller dist/images/kube-ovn-daemon
1111+
$(RM) dist/images/kube-ovn-healthcheck
11081112
$(RM) yamls/kind.yaml
11091113
$(RM) yamls/clab-bgp.yaml yamls/clab-bgp-ha.yaml
11101114
$(RM) ovn.yaml kube-ovn.yaml kube-ovn-crd.yaml

cmd/cmdmain.go

-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
"k8s.io/klog/v2"
1313

14-
"github.com/kubeovn/kube-ovn/cmd/health_check"
1514
"github.com/kubeovn/kube-ovn/cmd/ovn_ic_controller"
1615
"github.com/kubeovn/kube-ovn/cmd/ovn_leader_checker"
1716
"github.com/kubeovn/kube-ovn/cmd/ovn_monitor"
@@ -24,7 +23,6 @@ const (
2423
CmdMonitor = "kube-ovn-monitor"
2524
CmdSpeaker = "kube-ovn-speaker"
2625
CmdWebhook = "kube-ovn-webhook"
27-
CmdHealthCheck = "kube-ovn-healthcheck"
2826
CmdOvnLeaderChecker = "kube-ovn-leader-checker"
2927
CmdOvnICController = "kube-ovn-ic-controller"
3028
)
@@ -97,8 +95,6 @@ func main() {
9795
speaker.CmdMain()
9896
case CmdWebhook:
9997
webhook.CmdMain()
100-
case CmdHealthCheck:
101-
health_check.CmdMain()
10298
case CmdOvnLeaderChecker:
10399
ovn_leader_checker.CmdMain()
104100
case CmdOvnICController:

cmd/health_check/health_check.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package health_check
1+
package main
22

33
import (
44
"flag"
@@ -12,7 +12,7 @@ import (
1212
"github.com/kubeovn/kube-ovn/pkg/util"
1313
)
1414

15-
func CmdMain() {
15+
func main() {
1616
port := pflag.Int32("port", 0, "Target port")
1717
tls := pflag.Bool("tls", false, "Dial the server with TLS")
1818
enableMetrics := pflag.Bool("enable-metrics", true, "Whether to support metrics query")

dist/images/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ COPY kube-ovn /kube-ovn/kube-ovn
1111
COPY kube-ovn-cmd /kube-ovn/kube-ovn-cmd
1212
COPY kube-ovn-daemon /kube-ovn/kube-ovn-daemon
1313
COPY kube-ovn-controller /kube-ovn/kube-ovn-controller
14+
COPY kube-ovn-healthcheck /kube-ovn/kube-ovn-healthcheck
1415
RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \
1516
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-speaker && \
1617
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-webhook && \
17-
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-healthcheck && \
1818
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-leader-checker && \
1919
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-ic-controller && \
2020
ln -s /kube-ovn/kube-ovn-controller /kube-ovn/kube-ovn-pinger && \

0 commit comments

Comments
 (0)