Skip to content

Commit

Permalink
Merge pull request #81 from flux-framework/fix-upstream-changes
Browse files Browse the repository at this point in the history
fix: upstream changes for build and charts
  • Loading branch information
vsoch authored Aug 13, 2024
2 parents 052bdab + 2ad516c commit ad764b9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
Empty file modified .github/test.sh
100644 → 100755
Empty file.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ PLATFORMS ?= linux/amd64
BUILDER ?= docker

# We match this to the fluence build (see src/build/scheduler/Dockerfile)
GO_VERSION ?= "1.21.9"
GO_BASE_IMAGE?=golang:$(GO_VERSION)
DISTROLESS_BASE_IMAGE?=gcr.io/distroless/static:nonroot
GO_VERSION ?= 1.21.9
GO_BASE_IMAGE ?= golang:${GO_VERSION}
DISTROLESS_BASE_IMAGE ?= gcr.io/distroless/static:nonroot

.PHONY: all build build-sidecar clone update push push-sidecar push-controller

Expand Down Expand Up @@ -55,6 +55,7 @@ prepare: clone
cp sig-scheduler-plugins/cmd/controller/app/server.go $(CLONE_UPSTREAM)/cmd/controller/app/server.go

build: prepare
echo ${GO_BASE_IMAGE}
BUILDER=${BUILDER} PLATFORMS=${PLATFORMS} REGISTRY=${REGISTRY} IMAGE=${SCHEDULER_IMAGE} \
CONTROLLER_IMAGE=${CONTROLLER_IMAGE} RELEASE_VERSION=${RELEASE_VERSION} \
GO_BASE_IMAGE=${GO_BASE_IMAGE} DISTROLESS_BASE_IMAGE=${DISTROLESS_BASE_IMAGE} \
Expand Down
2 changes: 0 additions & 2 deletions examples/kind-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,4 @@ nodes:
- role: worker
- role: worker
- role: worker
- role: worker
- role: worker
- role: worker
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
- containerPort: {{ .Values.scheduler.port }}
hostPort: {{ .Values.scheduler.port }}{{ end }}
- command:
- /bin/kube-scheduler
- /kube-scheduler
- --config=/etc/kubernetes/scheduler-config.yaml
- -v={{ .Values.scheduler.loggingLevel }}
image: {{ .Values.scheduler.image }}
Expand Down

0 comments on commit ad764b9

Please sign in to comment.