Skip to content

Commit

Permalink
Merge pull request kosmos-io#61 from duanmengkk/release-1.21
Browse files Browse the repository at this point in the history
Fix the scheduling module failed to start with an error indicating missing args and add deploy manifests
  • Loading branch information
kosmos-robot authored Sep 25, 2023
2 parents ad1cb8b + 9a5fb07 commit 8eaddc3
Show file tree
Hide file tree
Showing 31 changed files with 713 additions and 547 deletions.
18 changes: 6 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ TARGETS := scheduler
# Example:
# make
# make all
# make clusterlink-controller-manager
# make clusterlink-controller-manager GOOS=linux
CMD_TARGET=$(TARGETS) $(CTL_TARGETS)
# make scheduler
CMD_TARGET=$(TARGETS)

.PHONY: all
all: $(CMD_TARGET)
Expand All @@ -38,8 +37,8 @@ $(CMD_TARGET):
#
# Example:
# make images
# make make image-clusterlink-controller-manager
# make make image-clusterlink-controller-manager GOARCH=arm64
# make image-scheduler
# make image-scheduler GOARCH=arm64
IMAGE_TARGET=$(addprefix image-, $(TARGETS))
.PHONY: $(IMAGE_TARGET)
$(IMAGE_TARGET):
Expand All @@ -54,7 +53,7 @@ images: $(IMAGE_TARGET)
#
# Example
# make multi-platform-images
# make mp-image-clusterlink-controller-manager
# make mp-image-scheduler
MP_TARGET=$(addprefix mp-image-, $(TARGETS))
.PHONY: $(MP_TARGET)
$(MP_TARGET):
Expand Down Expand Up @@ -97,12 +96,7 @@ upload-images: images
ifneq ($(REGISTRY_USER_NAME), "")
docker login -u ${REGISTRY_USER_NAME} -p ${REGISTRY_PASSWORD} ${REGISTRY_SERVER_ADDRESS}
endif
docker push ${REGISTRY}/clusterlink-controller-manager:${VERSION}
docker push ${REGISTRY}/clusterlink-operator:${VERSION}
docker push ${REGISTRY}/clusterlink-agent:${VERSION}
docker push ${REGISTRY}/clusterlink-proxy:${VERSION}
docker push ${REGISTRY}/clusterlink-network-manager:${VERSION}
docker push ${REGISTRY}/clusterlink-floater:${VERSION}
docker push ${REGISTRY}/scheduler:${VERSION}

# Build and package binary
#
Expand Down
1 change: 1 addition & 0 deletions cmd/scheduler/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"k8s.io/component-base/logs"
"k8s.io/kubernetes/cmd/kube-scheduler/app"

_ "github.com/kosmos.io/kosmos/pkg/apis/config/scheme"
"github.com/kosmos.io/kosmos/pkg/scheduler/lifted/plugins/knodetainttoleration"
"github.com/kosmos.io/kosmos/pkg/scheduler/lifted/plugins/knodevolumebinding"
)
Expand Down
26 changes: 0 additions & 26 deletions deploy/clusterlink-agent-proxy-configmap.yml

This file was deleted.

57 changes: 0 additions & 57 deletions deploy/clusterlink-agent.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions deploy/clusterlink-controller-manager.yml

This file was deleted.

26 changes: 0 additions & 26 deletions deploy/clusterlink-datapanel-rbac.yml

This file was deleted.

23 changes: 0 additions & 23 deletions deploy/clusterlink-elector-rbac.yml

This file was deleted.

62 changes: 0 additions & 62 deletions deploy/clusterlink-elector.yml

This file was deleted.

4 changes: 0 additions & 4 deletions deploy/clusterlink-namespace.yml

This file was deleted.

74 changes: 0 additions & 74 deletions deploy/clusterlink-network-manager.yml

This file was deleted.

Loading

0 comments on commit 8eaddc3

Please sign in to comment.