From e9a1058b4e23b2680a3a0ef88f9de1856552535f Mon Sep 17 00:00:00 2001 From: ddalvi Date: Sun, 16 Jun 2024 14:43:28 -0400 Subject: [PATCH] Upgrade go version to 1.21 --- .github/workflows/backend.yml | 2 +- api/go.mod | 2 +- backend/api/Dockerfile | 2 +- go.mod | 2 +- go.sum | 2 ++ kubernetes_platform/go.mod | 9 ++++----- kubernetes_platform/go.sum | 9 +++++++++ test/tools/project-cleaner/go.mod | 2 +- third_party/ml-metadata/go.mod | 10 +++++++--- third_party/ml-metadata/go.sum | 2 -- 10 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 kubernetes_platform/go.sum diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 73743c4db2eb..b699783f5e12 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -23,7 +23,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.20.x + go-version: 1.21.x - name: Checkout code uses: actions/checkout@v4 - name: "run go unit tests" diff --git a/api/go.mod b/api/go.mod index b147b9cdf79e..1d8c047d6a03 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/kubeflow/pipelines/api -go 1.16 +go 1.21 require ( google.golang.org/genproto v0.0.0-20211026145609-4688e4c4e024 diff --git a/backend/api/Dockerfile b/backend/api/Dockerfile index c5c65dcc4440..786ad2c0d3b3 100644 --- a/backend/api/Dockerfile +++ b/backend/api/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Generate client code (go & json) from API protocol buffers -FROM golang:1.20 as generator +FROM golang:1.21 as generator ENV GRPC_GATEWAY_VERSION v1.9.6 ENV GO_SWAGGER_VERSION v0.18.0 ENV GOLANG_PROTOBUF_VERSION v1.5.1 diff --git a/go.mod b/go.mod index 52fb544ad121..43ac2889ea84 100644 --- a/go.mod +++ b/go.mod @@ -210,6 +210,6 @@ replace ( sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.9 ) -go 1.20 +go 1.21 exclude github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f diff --git a/go.sum b/go.sum index 778208c8be2b..1b88be0d91f9 100644 --- a/go.sum +++ b/go.sum @@ -1470,6 +1470,7 @@ github.com/foxcpp/go-mockdns v0.0.0-20210729171921-fb145fc6f897/go.mod h1:lgRN6+ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -2769,6 +2770,7 @@ github.com/tektoncd/plumbing v0.0.0-20220817140952-3da8ce01aeeb/go.mod h1:uJBaI0 github.com/theupdateframework/go-tuf v0.5.2/go.mod h1:SyMV5kg5n4uEclsyxXJZI2UxPFJNDc4Y+r7wv+MlvTA= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= +github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= diff --git a/kubernetes_platform/go.mod b/kubernetes_platform/go.mod index 411776176de2..bcb7ac5f1c49 100644 --- a/kubernetes_platform/go.mod +++ b/kubernetes_platform/go.mod @@ -1,8 +1,7 @@ module github.com/kubeflow/pipelines/kubernetes_platform -go 1.16 +go 1.21 -require ( - google.golang.org/genproto v0.0.0-20211026145609-4688e4c4e024 - google.golang.org/protobuf v1.27.1 -) +require google.golang.org/protobuf v1.27.1 + +require golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect diff --git a/kubernetes_platform/go.sum b/kubernetes_platform/go.sum new file mode 100644 index 000000000000..38f2d030eb11 --- /dev/null +++ b/kubernetes_platform/go.sum @@ -0,0 +1,9 @@ +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= diff --git a/test/tools/project-cleaner/go.mod b/test/tools/project-cleaner/go.mod index 258a71081d97..6203267e1ee2 100644 --- a/test/tools/project-cleaner/go.mod +++ b/test/tools/project-cleaner/go.mod @@ -1,6 +1,6 @@ module github.com/kubeflow/pipelines/test/tools/project-cleaner -go 1.16 +go 1.21 require ( cloud.google.com/go v0.89.0 // indirect diff --git a/third_party/ml-metadata/go.mod b/third_party/ml-metadata/go.mod index e7853a4a6894..8d93804d678b 100644 --- a/third_party/ml-metadata/go.mod +++ b/third_party/ml-metadata/go.mod @@ -1,12 +1,16 @@ module github.com/kubeflow/pipelines/third_party/ml-metadata -go 1.16 +go 1.21 require ( + google.golang.org/grpc v1.43.0 + google.golang.org/protobuf v1.27.1 +) + +require ( + github.com/golang/protobuf v1.5.2 // indirect golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/genproto v0.0.0-20211221231510-d629cc9a93d5 // indirect - google.golang.org/grpc v1.43.0 - google.golang.org/protobuf v1.27.1 ) diff --git a/third_party/ml-metadata/go.sum b/third_party/ml-metadata/go.sum index d4502821e944..28718c4664af 100644 --- a/third_party/ml-metadata/go.sum +++ b/third_party/ml-metadata/go.sum @@ -84,7 +84,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -92,7 +91,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=