Upgrade the kubernetes dependencies to v1.28 and go version to 1.21

Signed-off-by: Syulin7 <735122171@qq.com>
kubeflow · Jul 10, 2024 · 90c6885 · 90c6885
1 parent 19c9090
commit 90c6885
Show file tree

Hide file tree

Showing 12 changed files with 292 additions and 415 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 jobs:
   build:
     docker:
-    - image: cimg/go:1.20.12
+    - image: cimg/go:1.21.12
     working_directory: /home/circleci/go/src/github.com/kubeflow/arena
     steps:
     - checkout

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - "1.20.12"
+  - "1.21.12"
 
 go_import_path: github.com/kubeflow/arena
 

diff --git a/Dockerfile.build b/Dockerfile.build
@@ -3,8 +3,8 @@
 # 
 # Create a go runtime for building arena
 
-ARG GOLANG_VERSION=1.20.12
-ARG KUBE_VERSION=v1.26.4
+ARG GOLANG_VERSION=1.21.12
+ARG KUBE_VERSION=v1.28.4
 ARG HELM_VERSION=v3.13.3
 ARG VERSION=v0.3.0-rc
 ARG OS_ARCH=linux-amd64

diff --git a/Dockerfile.install b/Dockerfile.install
@@ -1,5 +1,5 @@
 #FROM golang:1.10-stretch as build
-FROM golang:1.20.12 as build
+FROM golang:1.21.12 as build
 
 RUN mkdir -p /go/src/github.com/kubeflow/arena
 

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.20.12 as build
+FROM golang:1.21.12 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.20.12 as build
+FROM golang:1.21.12 as build
 
 RUN mkdir -p /go/src/github.com/kubeflow/arena
 

diff --git a/Makefile b/Makefile
@@ -114,12 +114,12 @@ notebook-image:
 .PHONY: build-pkg
 build-pkg:
 	docker rm -f arena-pkg || true
-	docker build --build-arg "KUBE_VERSION=v1.26.4" \
+	docker build --build-arg "KUBE_VERSION=v1.28.4" \
 				 --build-arg "HELM_VERSION=v3.13.3" \
 				 --build-arg "COMMIT=${GIT_SHORT_COMMIT}" \
 				 --build-arg "VERSION=${VERSION}" \
 				 --build-arg "OS_ARCH=${OS_ARCH}" \
-				 --build-arg "GOLANG_VERSION=1.20.12" \
+				 --build-arg "GOLANG_VERSION=1.21.12" \
 				 --build-arg "TARGET=cli-${OS_ARCH}" \
 	-t arena-build:${VERSION}-${GIT_SHORT_COMMIT}-${OS_ARCH} -f Dockerfile.build .
 	docker run -itd --name=arena-pkg arena-build:${VERSION}-${GIT_SHORT_COMMIT}-${OS_ARCH} /bin/bash
@@ -135,10 +135,10 @@ vet: ## Run go vet against code.
 GOLANGCI_LINT=$(shell which golangci-lint)
 golangci-lint:
 ifeq ($(GOLANGCI_LINT),)
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.53.3
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.57.2
 	$(info golangci-lint has been installed)
 endif
-	golangci-lint run --timeout 5m --go 1.20 ./...
+	golangci-lint run --timeout 5m --go 1.21 ./...
 
 test:
 	go test ./... -coverprofile cover.out

diff --git a/go.mod b/go.mod
@@ -1,85 +1,85 @@
 module github.com/kubeflow/arena
 
-go 1.20
+go 1.21
 
 require (
-	github.com/docker/docker v23.0.5+incompatible
+	github.com/docker/docker v24.0.0+incompatible
 	github.com/go-resty/resty/v2 v2.12.0
-	github.com/golang/glog v1.1.0
-	github.com/google/uuid v1.3.0
-	github.com/kserve/kserve v0.11.2
+	github.com/golang/glog v1.1.2
+	github.com/google/uuid v1.6.0
+	github.com/kserve/kserve v0.13.0
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/prometheus/client_golang v1.15.1
-	github.com/prometheus/common v0.43.0
-	github.com/sirupsen/logrus v1.9.0
-	github.com/spf13/cobra v1.7.0
+	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/common v0.45.0
+	github.com/sirupsen/logrus v1.9.1
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.10.0
-	github.com/stretchr/testify v1.8.1
+	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.21.0
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v2 v2.4.0
-	istio.io/api v0.0.0-20200715212100-dbf5277541ef
-	k8s.io/api v0.26.4
-	k8s.io/apiextensions-apiserver v0.26.4
-	k8s.io/apimachinery v0.26.4
-	k8s.io/cli-runtime v0.26.4
-	k8s.io/client-go v0.26.4
+	istio.io/api v1.19.4
+	k8s.io/api v0.28.4
+	k8s.io/apiextensions-apiserver v0.28.4
+	k8s.io/apimachinery v0.28.4
+	k8s.io/cli-runtime v0.28.4
+	k8s.io/client-go v0.28.4
 	k8s.io/kubectl v0.26.4
-	sigs.k8s.io/controller-runtime v0.14.6
+	sigs.k8s.io/controller-runtime v0.16.3
 )
 
 require (
-	cloud.google.com/go v0.110.2 // indirect
-	cloud.google.com/go/compute v1.19.3 // indirect
+	cloud.google.com/go v0.110.10 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.0.1 // indirect
-	cloud.google.com/go/storage v1.30.1 // indirect
+	cloud.google.com/go/iam v1.1.5 // indirect
+	cloud.google.com/go/storage v1.35.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
-	github.com/aws/aws-sdk-go v1.44.264 // indirect
+	github.com/aws/aws-sdk-go v1.48.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
-	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
+	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-errors/errors v1.0.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-errors/errors v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.1 // 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/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.0.1 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/go-containerregistry v0.15.2 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-containerregistry v0.16.1 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.3 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.8.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
@@ -92,106 +92,110 @@ require (
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/xlab/treeprint v1.1.0 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
+	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/oauth2 v0.14.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	google.golang.org/api v0.122.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.56.3 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
+	google.golang.org/api v0.151.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools v2.2.0+incompatible // indirect
-	istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a // indirect
-	k8s.io/component-base v0.26.4 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
-	knative.dev/networking v0.0.0-20230511122402-33636d99d870 // indirect
-	knative.dev/pkg v0.0.0-20230502134655-db8a35330281 // indirect
-	knative.dev/serving v0.37.1 // indirect
+	k8s.io/component-base v0.28.4 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	knative.dev/networking v0.0.0-20231115015815-3af9769712cd // indirect
+	knative.dev/pkg v0.0.0-20231115001034-97c7258e3a98 // indirect
+	knative.dev/serving v0.39.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.12.1 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace github.com/docker/docker => github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
 
-replace k8s.io/api => k8s.io/api v0.26.4
+replace k8s.io/api => k8s.io/api v0.28.4
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.4
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.4
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.28.5
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.26.4
+replace k8s.io/apiserver => k8s.io/apiserver v0.28.4
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.4
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
 
-replace k8s.io/client-go => k8s.io/client-go v0.26.4
+replace k8s.io/client-go => k8s.io/client-go v0.28.4
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.4
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.4
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.26.4
+replace k8s.io/code-generator => k8s.io/code-generator v0.28.5
 
-replace k8s.io/component-base => k8s.io/component-base v0.26.4
+replace k8s.io/component-base => k8s.io/component-base v0.28.4
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.4
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.4
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.26.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.26.4
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.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.26.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.26.4
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.4
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.26.4
+replace k8s.io/kubectl => k8s.io/kubectl v0.28.4
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.26.4
+replace k8s.io/kubelet => k8s.io/kubelet v0.28.4
 
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.4
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
 
-replace k8s.io/metrics => k8s.io/metrics v0.26.4
+replace k8s.io/metrics => k8s.io/metrics v0.28.4
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.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.26.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.26.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.26.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.26.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.26.4
+replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
 
-replace k8s.io/kms => k8s.io/kms v0.26.4
+replace k8s.io/kms => k8s.io/kms v0.28.4
+
+replace k8s.io/endpointslice => k8s.io/endpointslice v0.28.4