Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[controller] New version of extender scheduler #5

Merged
merged 5 commits into from
Feb 16, 2024
Merged

[controller] New version of extender scheduler #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7d23ec
new version of extender scheduler
ViktorKram Feb 8, 2024
0f9d238
adds context to scheduler
ViktorKram Feb 8, 2024
b2db7d2
little refactoring
ViktorKram Feb 8, 2024
7192142
Update images/sds-lvm-scheduler-extender/pkg/scheduler/filter.go
AleksZimin Feb 16, 2024
b4cda7a
Some comments
AleksZimin Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions images/sds-lvm-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
SHELL := /bin/bash
TEST-ARGS=-race -timeout 30s -count 1
base_golang_20_alpine := golang:1.20-alpine3.18
repo_fox := registry.flant.com/deckhouse/storage
image_name := sds-lvm


deployment_name=sds-lvm-controller
deployment_container_name=sds-lvm-controller
namespace=d8-sds-lvm
system_namespace=d8-system
pull_secret_name=fox-registry

USER := $(shell whoami)
image_tag := sds-lvm-controller-$(USER)

run: ## run go
go run -race ./cmd/main.go

test:
go test $(TEST-ARGS) ./...

fox_build_and_push:
docker build --build-arg="BASE_GOLANG_20_ALPINE_BUILDER=$(base_golang_20_alpine)" . -t $(repo_fox)/$(image_name):$(image_tag)
docker push $(repo_fox)/$(image_name):$(image_tag)

redeploy:
kubectl -n $(namespace) rollout restart deployment $(deployment_name)
kubectl -n $(namespace) rollout restart daemonset $(daemonset_name)

switch_to_local_dev:
kubectl -n $(system_namespace) scale deployment deckhouse --replicas=0
kubectl -n $(namespace) patch deployment $(deployment_name) -p \
'{"spec": {"template": {"spec": {"containers": [{"name": "$(deployment_container_name)", "image": "$(repo_fox)/$(image_name):$(image_tag)"}]}}}}'
kubectl -n $(namespace) patch deployment $(deployment_name) -p \
'{"spec": {"template": {"spec": {"containers": [{"name": "$(deployment_container_name)", "imagePullPolicy": "Always"}]}}}}'
kubectl -n $(namespace) patch deployment $(deployment_name) --type='json' \
-p='[{"op": "add", "path": "/spec/template/spec/imagePullSecrets", "value": [{"name": "$(pull_secret_name)"}]}]'


.PHONY: switch_to_local_dev
3 changes: 2 additions & 1 deletion images/sds-lvm-scheduler-extender/cmd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func subMain(parentCtx context.Context) error {
}
}

ctx := context.Background()
log, err := logger.NewLogger(logger.Verbosity(config.LogLevel))
if err != nil {
fmt.Println(fmt.Sprintf("[subMain] unable to initialize logger, err: %s", err.Error()))
Expand Down Expand Up @@ -111,7 +112,7 @@ func subMain(parentCtx context.Context) error {
WarningHandler: client.WarningHandlerOptions{},
})

h, err := scheduler.NewHandler(cl, *log, config.DefaultDivisor)
h, err := scheduler.NewHandler(ctx, cl, *log, config.DefaultDivisor)
if err != nil {
return err
}
Expand Down
Loading