Skip to content

Commit 9a5fb07

Browse files
committed
fix scheduler module starting failed with no knodevolumebinding args and add deploy manifests
Signed-off-by: duanmengkk <[email protected]>
1 parent 5d2fd00 commit 9a5fb07

31 files changed

+713
-547
lines changed

Makefile

+6-12
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ TARGETS := scheduler
1919
# Example:
2020
# make
2121
# make all
22-
# make clusterlink-controller-manager
23-
# make clusterlink-controller-manager GOOS=linux
24-
CMD_TARGET=$(TARGETS) $(CTL_TARGETS)
22+
# make scheduler
23+
CMD_TARGET=$(TARGETS)
2524

2625
.PHONY: all
2726
all: $(CMD_TARGET)
@@ -38,8 +37,8 @@ $(CMD_TARGET):
3837
#
3938
# Example:
4039
# make images
41-
# make make image-clusterlink-controller-manager
42-
# make make image-clusterlink-controller-manager GOARCH=arm64
40+
# make image-scheduler
41+
# make image-scheduler GOARCH=arm64
4342
IMAGE_TARGET=$(addprefix image-, $(TARGETS))
4443
.PHONY: $(IMAGE_TARGET)
4544
$(IMAGE_TARGET):
@@ -54,7 +53,7 @@ images: $(IMAGE_TARGET)
5453
#
5554
# Example
5655
# make multi-platform-images
57-
# make mp-image-clusterlink-controller-manager
56+
# make mp-image-scheduler
5857
MP_TARGET=$(addprefix mp-image-, $(TARGETS))
5958
.PHONY: $(MP_TARGET)
6059
$(MP_TARGET):
@@ -97,12 +96,7 @@ upload-images: images
9796
ifneq ($(REGISTRY_USER_NAME), "")
9897
docker login -u ${REGISTRY_USER_NAME} -p ${REGISTRY_PASSWORD} ${REGISTRY_SERVER_ADDRESS}
9998
endif
100-
docker push ${REGISTRY}/clusterlink-controller-manager:${VERSION}
101-
docker push ${REGISTRY}/clusterlink-operator:${VERSION}
102-
docker push ${REGISTRY}/clusterlink-agent:${VERSION}
103-
docker push ${REGISTRY}/clusterlink-proxy:${VERSION}
104-
docker push ${REGISTRY}/clusterlink-network-manager:${VERSION}
105-
docker push ${REGISTRY}/clusterlink-floater:${VERSION}
99+
docker push ${REGISTRY}/scheduler:${VERSION}
106100

107101
# Build and package binary
108102
#

cmd/scheduler/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/component-base/logs"
99
"k8s.io/kubernetes/cmd/kube-scheduler/app"
1010

11+
_ "github.com/kosmos.io/kosmos/pkg/apis/config/scheme"
1112
"github.com/kosmos.io/kosmos/pkg/scheduler/lifted/plugins/knodetainttoleration"
1213
"github.com/kosmos.io/kosmos/pkg/scheduler/lifted/plugins/knodevolumebinding"
1314
)

deploy/clusterlink-agent-proxy-configmap.yml

-26
This file was deleted.

deploy/clusterlink-agent.yaml

-57
This file was deleted.

deploy/clusterlink-controller-manager.yml

-42
This file was deleted.

deploy/clusterlink-datapanel-rbac.yml

-26
This file was deleted.

deploy/clusterlink-elector-rbac.yml

-23
This file was deleted.

deploy/clusterlink-elector.yml

-62
This file was deleted.

deploy/clusterlink-namespace.yml

-4
This file was deleted.

deploy/clusterlink-network-manager.yml

-74
This file was deleted.

0 commit comments

Comments
 (0)