Upgrade Go version to v1.20 (#1032)

Signed-off-by: Syulin7 <[email protected]>

.circleci/config.yml

@@ -5,7 +5,7 @@ version: 2
 jobs:
  build:
  docker:
- - image: cimg/go:1.19.4
+ - image: cimg/go:1.20.6
  working_directory: /home/circleci/go/src/github.com/kubeflow/arena
  steps:
  - checkout

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
- - "1.19.4"
+ - "1.20.6"
 
 go_import_path: github.com/kubeflow/arena
 

Dockerfile.build

@@ -3,7 +3,7 @@
 # 
 # Create a go runtime for building arena
 
-ARG GOLANG_VERSION=1.19.4
+ARG GOLANG_VERSION=1.20.6
 ARG KUBE_VERSION=v1.23.0
 ARG HELM_VERSION=v3.7.2
 ARG VERSION=v0.3.0-rc

Dockerfile.install

@@ -1,5 +1,5 @@
 #FROM golang:1.10-stretch as build
-FROM golang:1.19.4 as build
+FROM golang:1.20.6 as build
 
 RUN mkdir -p /go/src/github.com/kubeflow/arena
 

Dockerfile.notebook.cpu

@@ -3,7 +3,7 @@ ARG BASE_IMAGE=tensorflow/tensorflow:1.12.0-devel-py3
 
 ARG USER=root
 
-FROM golang:1.19.4 as build
+FROM golang:1.20.6 as build
 
 RUN mkdir -p /go/src/github.com/kubeflow/arena
 

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

Makefile

@@ -138,7 +138,7 @@ 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
  $(info golangci-lint has been installed)
 endif
- golangci-lint run --timeout 5m --go 1.18 ./...
+ golangci-lint run --timeout 5m --go 1.20 ./...
 
 test:
  go test ./... -coverprofile cover.out

cmd/uninstall/uninstall.go

@@ -4,7 +4,6 @@ import (
  "bytes"
  "flag"
  "fmt"
- "io/ioutil"
  "os"
  "os/exec"
  "path"
@@ -82,7 +81,7 @@ func deleteArenaArtifacts(force bool) error {
 }
 
 func parseFields(fileName string) ([]string, error) {
- contentBytes, err := ioutil.ReadFile(fileName)
+ contentBytes, err := os.ReadFile(fileName)
  if err != nil {
  return nil, fmt.Errorf("failed to read file %v,reason: %v", fileName, err)
  }
@@ -168,7 +167,7 @@ func detectManifests(manifestDir *string) (string, error) {
 }
 
 func detectCRDs(fileName string) ([]string, error) {
- contentBytes, err := ioutil.ReadFile(fileName)
+ contentBytes, err := os.ReadFile(fileName)
  if err != nil {
  return nil, fmt.Errorf("failed to read file %v,reason: %v", fileName, err)
  }

go.mod

@@ -1,6 +1,6 @@
 module github.com/kubeflow/arena
 
-go 1.18
+go 1.20
 
 require (
  github.com/docker/docker v20.10.12+incompatible

hack/docgen.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/apis/arenaclient/arenaclient.go

@@ -12,10 +12,11 @@ import (
 
 // ArenaClient is a client which includes operations:
 // 1.manage training jobs,like:
-// * submit a training job
-// * get a training job information
-// * get job logs
-// * delete a job
+// - submit a training job
+// - get a training job information
+// - get job logs
+// - delete a job
+//
 // TODO: 2.manage serving job
 // TODO: 3.manage node
 // it serves for commands and apis

pkg/apis/arenaclient/node_client.go

@@ -39,7 +39,7 @@ func (t *NodeClient) Details(nodeNames []string, nodeType types.NodeType, showMe
  return topnode.ListNodeDetails(nodeNames, nodeType, showMetric)
 }
 
-//  ListAndPrintNodes is used to display nodes informations
+// ListAndPrintNodes is used to display nodes informations
 func (t *NodeClient) ListAndPrintNodes(nodeNames []string, nodeType types.NodeType, format types.FormatStyle, details bool, notStop bool, showMetric bool) error {
  if format == types.UnknownFormat {
  return fmt.Errorf("Unknown output format,only support:[wide|json|yaml]")

pkg/apis/config/kubeclient.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/apis/config/user.go

@@ -3,7 +3,7 @@ package config
 import (
  "context"
  "fmt"
- "io/ioutil"
+ "os"
 
  authenticationapi "k8s.io/api/authentication/v1"
  authorizationv1 "k8s.io/api/authorization/v1"
@@ -29,7 +29,7 @@ func getUserName(namespace string, clientConfig clientcmd.ClientConfig, restConf
  var token string
  if tc.HasTokenAuth() {
  if restConfig.BearerTokenFile != "" {
- tokenContent, err := ioutil.ReadFile(restConfig.BearerTokenFile)
+ tokenContent, err := os.ReadFile(restConfig.BearerTokenFile)
  if err != nil {
  return nil, err
  }

pkg/apis/utils/utils.go

@@ -3,7 +3,6 @@ package utils
 import (
  "encoding/json"
  "fmt"
- "io/ioutil"
  "math"
  "os"
  "strings"
@@ -234,7 +233,7 @@ func DataUnitTransfer(from string, to string, value float64) float64 {
 }
 
 func ParseK8sObjectsFromYamlFile(filename string) ([]types.K8sObject, error) {
- data, err := ioutil.ReadFile(filename)
+ data, err := os.ReadFile(filename)
  if err != nil {
  return nil, err
  }

pkg/argsbuilder/builder.go

@@ -4,7 +4,7 @@ import (
  "github.com/spf13/cobra"
 )
 
-//  ArgsBuilder
+// ArgsBuilder
 type ArgsBuilder interface {
  AddSubBuilder(b ...ArgsBuilder) ArgsBuilder
  PreBuild() error

pkg/argsbuilder/scale_etjob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/scalein_etjob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/scaleout_etjob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/serving_custom.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/serving_kf.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/serving_tensorflow.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/serving_tensorrt.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/submit_etjob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/submit_horovodjob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/submit_mpijob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/submit_sparkjob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/submit_volcanojob.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/traffic_router_builder.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/update_serving_custom.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/update_serving_tensorflow.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/argsbuilder/update_serving_triton.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/commands/training/prune.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/operators/et-operator/api/common/types.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,