version updates for configurator and gas

Signed-off-by: Ukri Niemimuukko <[email protected]>

configurator/Dockerfile

@@ -1,7 +1,8 @@
 # Copyright (C) 2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.19 as builder
+ARG GO_VERSION
+FROM golang:${GO_VERSION} as builder
 ARG GOLICENSES_VERSION
 ARG LOCAL_LICENSES
 COPY . /src_root

configurator/Makefile

@@ -1,9 +1,9 @@
-GO_VERSION = 1.19
 IMAGE_TAG = latest
 ifneq ($(TAG),)
 IMAGE_TAG = $(TAG)
 endif
 
+GO_VERSION = 1.20
 GOLICENSES_VERSION?=v1.6.0
 
 BUILD_OUTPUT_DIR?=./bin
@@ -40,10 +40,12 @@ update-baseimage:
 
 containerized-build: update-baseimage
 	DOCKER_BUILDKIT=1 docker build -o - --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION) \
-	--build-arg LOCAL_LICENSES=$(LOCAL_LICENSES) -f Dockerfile ../ -t $(IMAGE_PATH)pas-configurator:$(IMAGE_TAG) | tar x bin/configurator
+	--build-arg GO_VERSION=$(GO_VERSION) --build-arg LOCAL_LICENSES=$(LOCAL_LICENSES) \
+	-f Dockerfile ../ -t $(IMAGE_PATH)pas-configurator:$(IMAGE_TAG) | tar x bin/configurator
 
 image: update-baseimage
-	docker build --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION) --build-arg LOCAL_LICENSES=$(LOCAL_LICENSES) \
+	docker build --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION) \
+	--build-arg GO_VERSION=$(GO_VERSION) --build-arg LOCAL_LICENSES=$(LOCAL_LICENSES) \
 	-f Dockerfile ../ -t $(IMAGE_PATH)pas-configurator:$(IMAGE_TAG)
 
 format:

configurator/go.mod

@@ -1,6 +1,6 @@
 module github.com/intel/platform-aware-scheduling/configurator
 
-go 1.19
+go 1.20
 
 require (
 	github.com/sergi/go-diff v1.3.1

gpu-aware-scheduling/Makefile

@@ -2,6 +2,7 @@ ifneq ($(TAG),)
 IMAGE_TAG=:$(TAG)
 endif
 
+GO_VERSION = 1.20
 GOLICENSES_VERSION?=v1.6.0
 BUILD_OUTPUT_DIR?=./bin
 
@@ -34,17 +35,18 @@ build:
 	CGO_ENABLED=0 GO111MODULE=on go build -ldflags="$(LDFLAGS)" -o $(BUILD_OUTPUT_DIR)/extender ./cmd/gas-scheduler-extender
 
 update-baseimage:
-	docker pull golang:1.19
+	docker pull golang:$(GO_VERSION)
 
 #note: you can speed up subsequent docker builds by doing "go mod vendor"
 #note: you can further speed up subsequent docker builds by doing "make licenses"
 image: update-baseimage
-	docker build --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION) --build-arg LOCAL_LICENSES=$(LOCAL_LICENSES) \
+	docker build --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION) \
+	--build-arg LOCAL_LICENSES=$(LOCAL_LICENSES) --build-arg GO_VERSION=$(GO_VERSION) \
 	-f deploy/images/Dockerfile ../ -t $(IMAGE_PATH)gpu-extender$(IMAGE_TAG)
 
 release-image: clean update-baseimage
-	docker build --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION) -f deploy/images/Dockerfile ../ \
-	-t $(IMAGE_PATH)gpu-extender$(IMAGE_TAG)
+	docker build --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION) --build-arg GO_VERSION=$(GO_VERSION) \
+	-f deploy/images/Dockerfile ../ -t $(IMAGE_PATH)gpu-extender$(IMAGE_TAG)
 
 format:
 	gofmt -w -s .

gpu-aware-scheduling/deploy/images/Dockerfile

@@ -1,7 +1,8 @@
 # Copyright (C) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.19 as builder
+ARG GO_VERSION
+FROM golang:${GO_VERSION} as builder
 ARG GOLICENSES_VERSION
 ARG LOCAL_LICENSES
 COPY . /src_root

gpu-aware-scheduling/go.mod

@@ -1,15 +1,15 @@
 module github.com/intel/platform-aware-scheduling/gpu-aware-scheduling
 
-go 1.19
+go 1.20
 
 require (
 	github.com/intel/platform-aware-scheduling/extender v0.5.0
 	github.com/pkg/errors v0.9.1
-	github.com/smartystreets/goconvey v1.8.0
-	github.com/stretchr/testify v1.8.3
-	k8s.io/api v0.27.2
-	k8s.io/apimachinery v0.27.2
-	k8s.io/client-go v0.27.2
+	github.com/smartystreets/goconvey v1.8.1
+	github.com/stretchr/testify v1.8.4
+	k8s.io/api v0.27.4
+	k8s.io/apimachinery v0.27.4
+	k8s.io/client-go v0.27.4
 	k8s.io/klog/v2 v2.100.1
 )
 
@@ -18,9 +18,9 @@ require (
 	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
@@ -37,25 +37,24 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/smartystreets/assertions v1.13.1 // indirect
+	github.com/smarty/assertions v1.15.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/term v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/net v0.13.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.9.1 // indirect
+	golang.org/x/tools v0.11.1 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
 	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )