Bump golang from 1.21 to 1.22.7 (#1142)

Signed-off-by: Yi Chen <[email protected]>
kubeflow · Sep 29, 2024 · 0d95df6 · 0d95df6
1 parent 11b771b
commit 0d95df6
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 65 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_IMAGE=debian:12-slim
 
-FROM golang:1.21.12 as builder
+FROM golang:1.22.7 as builder
 
 ARG TARGETOS
 

diff --git a/Dockerfile.notebook.cpu b/Dockerfile.notebook.cpu
@@ -3,7 +3,7 @@ ARG BASE_IMAGE=tensorflow/tensorflow:1.12.0-devel-py3
 
 ARG USER=root
 
-FROM golang:1.21.12 as build
+FROM golang:1.22.7 as build
 
 RUN mkdir -p /go/src/github.com/kubeflow/arena
 

diff --git a/Dockerfile.notebook.kubeflow b/Dockerfile.notebook.kubeflow
@@ -2,7 +2,7 @@ ARG BASE_IMAGE=registry.aliyuncs.com/kubeflow-images-public/tensorflow-1.12.0-no
 
 ARG USER=jovyan
 
-FROM golang:1.21.12 as build
+FROM golang:1.22.7 as build
 
 RUN mkdir -p /go/src/github.com/kubeflow/arena
 

diff --git a/Makefile b/Makefile
@@ -125,8 +125,13 @@ go-vet: ## Run go vet against code.
 
 .PHONY: go-lint
 go-lint: golangci-lint ## Run golangci-lint linter.
-	@echo "Running golangci-lint..."
-	$(LOCALBIN)/$(GOLANGCI_LINT) run --timeout 5m --go 1.21 ./...
+	@echo "Running golangci-lint run..."
+	$(LOCALBIN)/$(GOLANGCI_LINT) run --timeout 5m ./...
+
+.PHONY: go-lint-fix
+go-lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes.
+	@echo "Running golangci-lint run --fix..."
+	$(LOCALBIN)/$(GOLANGCI_LINT) run --fix --timeout 5m ./...
 
 .PHONY: unit-test
 unit-test: ## Run go unit tests.

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubeflow/arena
 
-go 1.21
+go 1.22.7
 
 require (
 	github.com/go-resty/resty/v2 v2.15.2
@@ -134,62 +134,35 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace k8s.io/api => k8s.io/api v0.28.4
-
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
-
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.28.5
-
-replace k8s.io/apiserver => k8s.io/apiserver v0.28.4
-
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
-
-replace k8s.io/client-go => k8s.io/client-go v0.28.4
-
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
-
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.28.5
-
-replace k8s.io/component-base => k8s.io/component-base v0.28.4
-
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
-
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
-
-replace k8s.io/cri-api => k8s.io/cri-api v0.28.5
-
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
-
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
-
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
-
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
-
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.28.4
-
-replace k8s.io/kubelet => k8s.io/kubelet v0.28.4
-
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
-
-replace k8s.io/metrics => k8s.io/metrics v0.28.4
-
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
-
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
-
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
-
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4
-
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.28.4
-
-replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
-
-replace k8s.io/kms => k8s.io/kms v0.28.4
-
-replace k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
+replace (
+	k8s.io/api => k8s.io/api v0.28.4
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.28.5
+	k8s.io/apiserver => k8s.io/apiserver v0.28.4
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
+	k8s.io/client-go => k8s.io/client-go v0.28.4
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
+	k8s.io/code-generator => k8s.io/code-generator v0.28.5
+	k8s.io/component-base => k8s.io/component-base v0.28.4
+	k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
+	k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
+	k8s.io/cri-api => k8s.io/cri-api v0.28.5
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
+	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
+	k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
+	k8s.io/kms => k8s.io/kms v0.28.4
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
+	k8s.io/kubectl => k8s.io/kubectl v0.28.4
+	k8s.io/kubelet => k8s.io/kubelet v0.28.4
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
+	k8s.io/metrics => k8s.io/metrics v0.28.4
+	k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4
+	k8s.io/sample-controller => k8s.io/sample-controller v0.28.4
+)