Skip to content

Commit

Permalink
UPSTREAM: <drop>: use go.1.20 - revert
Browse files Browse the repository at this point in the history 
This reverts commit 0d57ebb.
  • Loading branch information
@soltysh
soltysh committed Jan 5, 2024
1 parent 5075d3b commit ba814dc
Show file tree
Hide file tree
Showing 38 changed files with 75 additions and 89 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

module k8s.io/kubernetes

go 1.20
go 1.21

require (
bitbucket.org/bertimus9/systemstat v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/golang.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ EOF
local go_version
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
local minimum_go_version
minimum_go_version=go1.20
minimum_go_version=go1.21
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
kube::log::usage_from_stdin <<EOF
Detected go version: ${go_version[*]}.
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/api

go 1.20
go 1.21

require (
github.com/gogo/protobuf v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiextensions-apiserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/apiextensions-apiserver

go 1.20
go 1.21

require (
github.com/emicklei/go-restful/v3 v3.11.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apimachinery/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/apimachinery

go 1.20
go 1.21

require (
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/apiserver

go 1.20
go 1.21

require (
github.com/coreos/go-oidc v2.2.1+incompatible
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/cli-runtime/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/cli-runtime

go 1.20
go 1.21

require (
github.com/evanphx/json-patch v4.12.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/client-go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/client-go

go 1.20
go 1.21

require (
github.com/evanphx/json-patch v4.12.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/cloud-provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/cloud-provider

go 1.20
go 1.21

require (
github.com/google/go-cmp v0.6.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/cluster-bootstrap/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/cluster-bootstrap

go 1.20
go 1.21

require (
github.com/stretchr/testify v1.8.4
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/code-generator/examples/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/code-generator/examples

go 1.20
go 1.21

require (
k8s.io/api v0.29.0
Expand Down
9 changes: 9 additions & 0 deletions staging/src/k8s.io/code-generator/examples/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion staging/src/k8s.io/code-generator/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/code-generator

go 1.20
go 1.21

require (
github.com/gogo/protobuf v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/component-base/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/component-base

go 1.20
go 1.21

require (
github.com/blang/semver/v4 v4.0.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/component-helpers/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/component-helpers

go 1.20
go 1.21

require (
github.com/google/go-cmp v0.6.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/controller-manager/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/controller-manager

go 1.20
go 1.21

require (
github.com/spf13/pflag v1.0.5
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/cri-api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/cri-api

go 1.20
go 1.21

require (
github.com/gogo/protobuf v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/csi-translation-lib/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/csi-translation-lib

go 1.20
go 1.21

require (
github.com/stretchr/testify v1.8.4
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/dynamic-resource-allocation/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/dynamic-resource-allocation

go 1.20
go 1.21

require (
github.com/go-logr/logr v1.3.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/endpointslice/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/endpointslice

go 1.20
go 1.21

require (
github.com/davecgh/go-spew v1.1.1
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kms/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/kms

go 1.20
go 1.21

require (
github.com/gogo/protobuf v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kms/internal/plugins/_mock/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k8s.io/kms/plugins/mock

go 1.20
go 1.21

require (
github.com/ThalesIgnite/crypto11 v1.2.5
Expand Down
1 change: 1 addition & 0 deletions staging/src/k8s.io/kms/internal/plugins/_mock/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion staging/src/k8s.io/kube-aggregator/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/kube-aggregator

go 1.20
go 1.21

require (
github.com/emicklei/go-restful/v3 v3.11.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kube-controller-manager/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/kube-controller-manager

go 1.20
go 1.21

require (
k8s.io/apimachinery v0.29.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kube-proxy/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/kube-proxy

go 1.20
go 1.21

require (
k8s.io/apimachinery v0.29.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kube-scheduler/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/kube-scheduler

go 1.20
go 1.21

require (
github.com/google/go-cmp v0.6.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kubectl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/kubectl

go 1.20
go 1.21

require (
github.com/MakeNowJust/heredoc v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kubelet/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/kubelet

go 1.20
go 1.21

require (
github.com/emicklei/go-restful/v3 v3.11.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/legacy-cloud-providers/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/legacy-cloud-providers

go 1.20
go 1.21

require (
cloud.google.com/go/compute/metadata v0.2.3
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/metrics/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/metrics

go 1.20
go 1.21

require (
github.com/gogo/protobuf v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/mount-utils/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/mount-utils

go 1.20
go 1.21

require (
github.com/moby/sys/mountinfo v0.6.2
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/pod-security-admission/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/pod-security-admission

go 1.20
go 1.21

require (
github.com/blang/semver/v4 v4.0.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/sample-apiserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/sample-apiserver

go 1.20
go 1.21

require (
github.com/google/gofuzz v1.2.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/sample-cli-plugin/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/sample-cli-plugin

go 1.20
go 1.21

require (
github.com/spf13/cobra v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/sample-controller/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module k8s.io/sample-controller

go 1.20
go 1.21

require (
golang.org/x/time v0.3.0
Expand Down

0 comments on commit ba814dc

Please sign in to comment.