Merge pull request #81 from flux-framework/fix-upstream-changes

fix: upstream changes for build and charts

Author: vsoch

.github/test.sh

@@ -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
 
@@ -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} \

Makefile

@@ -21,6 +21,4 @@ nodes:
 - role: worker
 - role: worker
 - role: worker
-- role: worker
-- role: worker
 - role: worker

examples/kind-config.yaml

@@ -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 }}