Skip to content

Commit

Permalink
UPSTREAM: <drop>: use go 1.18.0 as minimum version
Browse files Browse the repository at this point in the history
  • Loading branch information
@tkashem @soltysh
tkashem authored and soltysh committed Aug 23, 2022
1 parent 2379829 commit 31c1a11
Show file tree
Hide file tree
Showing 31 changed files with 46 additions and 46 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.19
go 1.18

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 @@ -483,7 +483,7 @@ EOF
local go_version
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
local minimum_go_version
minimum_go_version=go1.19
minimum_go_version=go1.18.0
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 hack/tools/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k8s.io/kubernetes/hack/tools

go 1.19
go 1.18

require (
github.com/aojea/sloppy-netparser v0.0.0-20210819225411-1b3bd8b3b975
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.19
go 1.18

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.19
go 1.18

require (
github.com/emicklei/go-restful/v3 v3.8.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.19
go 1.18

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.19
go 1.18

require (
github.com/coreos/go-oidc v2.1.0+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.19
go 1.18

require (
github.com/davecgh/go-spew v1.1.1
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.19
go 1.18

require (
github.com/davecgh/go-spew v1.1.1
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.19
go 1.18

require (
github.com/google/go-cmp v0.5.6
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.19
go 1.18

require (
github.com/stretchr/testify v1.7.0
Expand Down
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.19
go 1.18

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.19
go 1.18

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.19
go 1.18

require (
github.com/google/go-cmp v0.5.6
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.19
go 1.18

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.19
go 1.18

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.19
go 1.18

require (
github.com/stretchr/testify v1.7.0
Expand Down
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.19
go 1.18

require (
github.com/davecgh/go-spew v1.1.1
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.19
go 1.18

require (
k8s.io/apimachinery v0.25.0-rc.1
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.19
go 1.18

require (
k8s.io/apimachinery v0.25.0-rc.1
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.19
go 1.18

require (
github.com/google/go-cmp v0.5.6
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.19
go 1.18

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.19
go 1.18

require (
github.com/gogo/protobuf v1.3.2
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.19
go 1.18

require (
cloud.google.com/go v0.97.0
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.19
go 1.18

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.19
go 1.18

require (
github.com/moby/sys/mountinfo v0.6.0
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.19
go 1.18

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.19
go 1.18

require (
github.com/google/gofuzz v1.1.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.19
go 1.18

require (
github.com/spf13/cobra v1.4.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.19
go 1.18

require (
k8s.io/api v0.25.0-rc.1
Expand Down
32 changes: 16 additions & 16 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/tokentest
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
k8s.io/apiserver/plugin/pkg/authorizer/webhook
# k8s.io/cli-runtime v0.0.0 => ./staging/src/k8s.io/cli-runtime
## explicit; go 1.19
## explicit; go 1.18
k8s.io/cli-runtime/pkg/genericclioptions
k8s.io/cli-runtime/pkg/printers
k8s.io/cli-runtime/pkg/resource
Expand Down Expand Up @@ -2202,7 +2202,7 @@ k8s.io/client-go/util/retry
k8s.io/client-go/util/testing
k8s.io/client-go/util/workqueue
# k8s.io/cloud-provider v0.0.0 => ./staging/src/k8s.io/cloud-provider
## explicit; go 1.19
## explicit; go 1.18
k8s.io/cloud-provider
k8s.io/cloud-provider/api
k8s.io/cloud-provider/app
Expand All @@ -2226,7 +2226,7 @@ k8s.io/cloud-provider/volume
k8s.io/cloud-provider/volume/errors
k8s.io/cloud-provider/volume/helpers
# k8s.io/cluster-bootstrap v0.0.0 => ./staging/src/k8s.io/cluster-bootstrap
## explicit; go 1.19
## explicit; go 1.18
k8s.io/cluster-bootstrap/token/api
k8s.io/cluster-bootstrap/token/jws
k8s.io/cluster-bootstrap/token/util
Expand Down Expand Up @@ -2290,7 +2290,7 @@ k8s.io/component-helpers/scheduling/corev1/nodeaffinity
k8s.io/component-helpers/storage/ephemeral
k8s.io/component-helpers/storage/volume
# k8s.io/controller-manager v0.0.0 => ./staging/src/k8s.io/controller-manager
## explicit; go 1.19
## explicit; go 1.18
k8s.io/controller-manager/app
k8s.io/controller-manager/config
k8s.io/controller-manager/config/v1
Expand All @@ -2307,14 +2307,14 @@ k8s.io/controller-manager/pkg/leadermigration
k8s.io/controller-manager/pkg/leadermigration/config
k8s.io/controller-manager/pkg/leadermigration/options
# k8s.io/cri-api v0.0.0 => ./staging/src/k8s.io/cri-api
## explicit; go 1.19
## explicit; go 1.18
k8s.io/cri-api/pkg/apis
k8s.io/cri-api/pkg/apis/runtime/v1
k8s.io/cri-api/pkg/apis/runtime/v1alpha2
k8s.io/cri-api/pkg/apis/testing
k8s.io/cri-api/pkg/errors
# k8s.io/csi-translation-lib v0.0.0 => ./staging/src/k8s.io/csi-translation-lib
## explicit; go 1.19
## explicit; go 1.18
k8s.io/csi-translation-lib
k8s.io/csi-translation-lib/plugins
# k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 => k8s.io/gengo v0.0.0-20211129171323-c02415ce4185
Expand Down Expand Up @@ -2373,7 +2373,7 @@ k8s.io/kube-aggregator/pkg/registry/apiservice
k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
k8s.io/kube-aggregator/pkg/registry/apiservice/rest
# k8s.io/kube-controller-manager v0.0.0 => ./staging/src/k8s.io/kube-controller-manager
## explicit; go 1.19
## explicit; go 1.18
k8s.io/kube-controller-manager/config/v1alpha1
# k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
## explicit; go 1.18
Expand Down Expand Up @@ -2405,16 +2405,16 @@ k8s.io/kube-openapi/pkg/validation/strfmt
k8s.io/kube-openapi/pkg/validation/strfmt/bson
k8s.io/kube-openapi/pkg/validation/validate
# k8s.io/kube-proxy v0.0.0 => ./staging/src/k8s.io/kube-proxy
## explicit; go 1.19
## explicit; go 1.18
k8s.io/kube-proxy/config/v1alpha1
# k8s.io/kube-scheduler v0.0.0 => ./staging/src/k8s.io/kube-scheduler
## explicit; go 1.19
## explicit; go 1.18
k8s.io/kube-scheduler/config/v1
k8s.io/kube-scheduler/config/v1beta2
k8s.io/kube-scheduler/config/v1beta3
k8s.io/kube-scheduler/extender/v1
# k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
## explicit; go 1.19
## explicit; go 1.18
k8s.io/kubectl/pkg/apps
k8s.io/kubectl/pkg/cmd
k8s.io/kubectl/pkg/cmd/annotate
Expand Down Expand Up @@ -2498,7 +2498,7 @@ k8s.io/kubectl/pkg/util/templates
k8s.io/kubectl/pkg/util/term
k8s.io/kubectl/pkg/validation
# k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet
## explicit; go 1.19
## explicit; go 1.18
k8s.io/kubelet/config/v1alpha1
k8s.io/kubelet/config/v1beta1
k8s.io/kubelet/pkg/apis
Expand All @@ -2512,7 +2512,7 @@ k8s.io/kubelet/pkg/apis/podresources/v1
k8s.io/kubelet/pkg/apis/podresources/v1alpha1
k8s.io/kubelet/pkg/apis/stats/v1alpha1
# k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers
## explicit; go 1.19
## explicit; go 1.18
k8s.io/legacy-cloud-providers/aws
k8s.io/legacy-cloud-providers/azure
k8s.io/legacy-cloud-providers/azure/auth
Expand Down Expand Up @@ -2557,7 +2557,7 @@ k8s.io/legacy-cloud-providers/vsphere/testing
k8s.io/legacy-cloud-providers/vsphere/vclib
k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers
# k8s.io/metrics v0.0.0 => ./staging/src/k8s.io/metrics
## explicit; go 1.19
## explicit; go 1.18
k8s.io/metrics/pkg/apis/custom_metrics
k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
k8s.io/metrics/pkg/apis/custom_metrics/v1beta2
Expand All @@ -2579,10 +2579,10 @@ k8s.io/metrics/pkg/client/custom_metrics/scheme
k8s.io/metrics/pkg/client/external_metrics
k8s.io/metrics/pkg/client/external_metrics/fake
# k8s.io/mount-utils v0.0.0 => ./staging/src/k8s.io/mount-utils
## explicit; go 1.19
## explicit; go 1.18
k8s.io/mount-utils
# k8s.io/pod-security-admission v0.0.0 => ./staging/src/k8s.io/pod-security-admission
## explicit; go 1.19
## explicit; go 1.18
k8s.io/pod-security-admission/admission
k8s.io/pod-security-admission/admission/api
k8s.io/pod-security-admission/admission/api/load
Expand All @@ -2598,7 +2598,7 @@ k8s.io/pod-security-admission/metrics
k8s.io/pod-security-admission/policy
k8s.io/pod-security-admission/test
# k8s.io/sample-apiserver v0.0.0 => ./staging/src/k8s.io/sample-apiserver
## explicit; go 1.19
## explicit; go 1.18
k8s.io/sample-apiserver/pkg/admission/plugin/banflunder
k8s.io/sample-apiserver/pkg/admission/wardleinitializer
k8s.io/sample-apiserver/pkg/apis/wardle
Expand Down

0 comments on commit 31c1a11

Please sign in to comment.