From 65ef53139012dee36c08f558604dea48af170e11 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 10 Sep 2024 12:07:06 -0400 Subject: [PATCH 1/3] Update go.mod to go 1.23 --- go.mod | 2 +- go.work | 2 +- hack/tools/go.mod | 2 +- hack/tools/go.work | 2 +- staging/src/k8s.io/api/go.mod | 2 +- .../src/k8s.io/apiextensions-apiserver/go.mod | 2 +- staging/src/k8s.io/apimachinery/go.mod | 2 +- staging/src/k8s.io/apiserver/go.mod | 2 +- staging/src/k8s.io/cli-runtime/go.mod | 2 +- staging/src/k8s.io/client-go/go.mod | 2 +- staging/src/k8s.io/cloud-provider/go.mod | 2 +- staging/src/k8s.io/cluster-bootstrap/go.mod | 2 +- .../src/k8s.io/code-generator/examples/go.mod | 2 +- .../k8s.io/code-generator/examples/go.work | 2 +- staging/src/k8s.io/code-generator/go.mod | 2 +- staging/src/k8s.io/component-base/go.mod | 2 +- staging/src/k8s.io/component-helpers/go.mod | 2 +- staging/src/k8s.io/controller-manager/go.mod | 2 +- staging/src/k8s.io/cri-api/go.mod | 2 +- staging/src/k8s.io/cri-client/go.mod | 2 +- staging/src/k8s.io/csi-translation-lib/go.mod | 2 +- .../k8s.io/dynamic-resource-allocation/go.mod | 2 +- staging/src/k8s.io/endpointslice/go.mod | 2 +- staging/src/k8s.io/kms/go.mod | 2 +- .../k8s.io/kms/internal/plugins/_mock/go.mod | 2 +- .../k8s.io/kms/internal/plugins/_mock/go.work | 2 +- staging/src/k8s.io/kube-aggregator/go.mod | 2 +- .../src/k8s.io/kube-controller-manager/go.mod | 2 +- staging/src/k8s.io/kube-proxy/go.mod | 2 +- staging/src/k8s.io/kube-scheduler/go.mod | 2 +- staging/src/k8s.io/kubectl/go.mod | 2 +- staging/src/k8s.io/kubelet/go.mod | 2 +- staging/src/k8s.io/metrics/go.mod | 2 +- staging/src/k8s.io/mount-utils/go.mod | 2 +- .../src/k8s.io/pod-security-admission/go.mod | 2 +- staging/src/k8s.io/sample-apiserver/go.mod | 2 +- staging/src/k8s.io/sample-cli-plugin/go.mod | 2 +- staging/src/k8s.io/sample-controller/go.mod | 2 +- vendor/modules.txt | 56 +++++++++---------- 39 files changed, 66 insertions(+), 66 deletions(-) diff --git a/go.mod b/go.mod index 4851c8191fa..94053a87adf 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ module k8s.io/kubernetes -go 1.22.0 +go 1.23.0 require ( bitbucket.org/bertimus9/systemstat v0.5.0 diff --git a/go.work b/go.work index 51b38eb127e..d9a635619a4 100644 --- a/go.work +++ b/go.work @@ -1,6 +1,6 @@ // This is a generated file. Do not edit directly. -go 1.22.0 +go 1.23.0 use ( . diff --git a/hack/tools/go.mod b/hack/tools/go.mod index c2070c0f8f7..44d2b8446d4 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module k8s.io/kubernetes/hack/tools -go 1.22.1 +go 1.23.0 require ( github.com/aojea/sloppy-netparser v0.0.0-20210819225411-1b3bd8b3b975 diff --git a/hack/tools/go.work b/hack/tools/go.work index 41c0499e9ba..7f9e05680c5 100644 --- a/hack/tools/go.work +++ b/hack/tools/go.work @@ -1,6 +1,6 @@ // This is a hack, but it prevents go from climbing further and trying to // reconcile the various deps across the "real" modules and this one. -go 1.22.1 +go 1.23.0 use . diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod index c73f1f2fbd4..41be0858396 100644 --- a/staging/src/k8s.io/api/go.mod +++ b/staging/src/k8s.io/api/go.mod @@ -2,7 +2,7 @@ module k8s.io/api -go 1.22.0 +go 1.23.0 require ( github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index 5b13d41755f..d35b1b484b3 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -2,7 +2,7 @@ module k8s.io/apiextensions-apiserver -go 1.22.0 +go 1.23.0 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod index b5a12d031bc..7dcfca16a0c 100644 --- a/staging/src/k8s.io/apimachinery/go.mod +++ b/staging/src/k8s.io/apimachinery/go.mod @@ -2,7 +2,7 @@ module k8s.io/apimachinery -go 1.22.0 +go 1.23.0 require ( github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 2a79d019c11..8d8ad48e7b5 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -2,7 +2,7 @@ module k8s.io/apiserver -go 1.22.0 +go 1.23.0 require ( github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod index e844263da8a..9581ece0523 100644 --- a/staging/src/k8s.io/cli-runtime/go.mod +++ b/staging/src/k8s.io/cli-runtime/go.mod @@ -2,7 +2,7 @@ module k8s.io/cli-runtime -go 1.22.0 +go 1.23.0 require ( github.com/google/gnostic-models v0.6.8 diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index 942f21456d3..1f018ac2ed2 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -2,7 +2,7 @@ module k8s.io/client-go -go 1.22.0 +go 1.23.0 require ( github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod index f4eabe5ad4d..1c173e67ff7 100644 --- a/staging/src/k8s.io/cloud-provider/go.mod +++ b/staging/src/k8s.io/cloud-provider/go.mod @@ -2,7 +2,7 @@ module k8s.io/cloud-provider -go 1.22.0 +go 1.23.0 require ( github.com/google/go-cmp v0.6.0 diff --git a/staging/src/k8s.io/cluster-bootstrap/go.mod b/staging/src/k8s.io/cluster-bootstrap/go.mod index 83ec378becd..f440ac3221e 100644 --- a/staging/src/k8s.io/cluster-bootstrap/go.mod +++ b/staging/src/k8s.io/cluster-bootstrap/go.mod @@ -2,7 +2,7 @@ module k8s.io/cluster-bootstrap -go 1.22.0 +go 1.23.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/staging/src/k8s.io/code-generator/examples/go.mod b/staging/src/k8s.io/code-generator/examples/go.mod index 8d23a350633..4a66b3bbe2e 100644 --- a/staging/src/k8s.io/code-generator/examples/go.mod +++ b/staging/src/k8s.io/code-generator/examples/go.mod @@ -2,7 +2,7 @@ module k8s.io/code-generator/examples -go 1.22.0 +go 1.23.0 require ( k8s.io/api v0.0.0 diff --git a/staging/src/k8s.io/code-generator/examples/go.work b/staging/src/k8s.io/code-generator/examples/go.work index c6e5470a593..7f9e05680c5 100644 --- a/staging/src/k8s.io/code-generator/examples/go.work +++ b/staging/src/k8s.io/code-generator/examples/go.work @@ -1,6 +1,6 @@ // This is a hack, but it prevents go from climbing further and trying to // reconcile the various deps across the "real" modules and this one. -go 1.22.0 +go 1.23.0 use . diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index ecd05254c5c..0189dda15ba 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -2,7 +2,7 @@ module k8s.io/code-generator -go 1.22.0 +go 1.23.0 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod index 75f3d9c5429..edfc6f3f9eb 100644 --- a/staging/src/k8s.io/component-base/go.mod +++ b/staging/src/k8s.io/component-base/go.mod @@ -2,7 +2,7 @@ module k8s.io/component-base -go 1.22.0 +go 1.23.0 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/staging/src/k8s.io/component-helpers/go.mod b/staging/src/k8s.io/component-helpers/go.mod index fb98d31561b..0e46e3f61a9 100644 --- a/staging/src/k8s.io/component-helpers/go.mod +++ b/staging/src/k8s.io/component-helpers/go.mod @@ -2,7 +2,7 @@ module k8s.io/component-helpers -go 1.22.0 +go 1.23.0 require ( github.com/google/go-cmp v0.6.0 diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod index 82c27afc983..dac373109d7 100644 --- a/staging/src/k8s.io/controller-manager/go.mod +++ b/staging/src/k8s.io/controller-manager/go.mod @@ -2,7 +2,7 @@ module k8s.io/controller-manager -go 1.22.0 +go 1.23.0 require ( github.com/spf13/pflag v1.0.5 diff --git a/staging/src/k8s.io/cri-api/go.mod b/staging/src/k8s.io/cri-api/go.mod index a825b3a9273..c630ed02a87 100644 --- a/staging/src/k8s.io/cri-api/go.mod +++ b/staging/src/k8s.io/cri-api/go.mod @@ -2,7 +2,7 @@ module k8s.io/cri-api -go 1.22.0 +go 1.23.0 require ( github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/cri-client/go.mod b/staging/src/k8s.io/cri-client/go.mod index 9151d936358..986a8d6bde7 100644 --- a/staging/src/k8s.io/cri-client/go.mod +++ b/staging/src/k8s.io/cri-client/go.mod @@ -2,7 +2,7 @@ module k8s.io/cri-client -go 1.22.0 +go 1.23.0 require ( github.com/Microsoft/go-winio v0.6.0 diff --git a/staging/src/k8s.io/csi-translation-lib/go.mod b/staging/src/k8s.io/csi-translation-lib/go.mod index c3fa71661b8..b2c2ac83cb9 100644 --- a/staging/src/k8s.io/csi-translation-lib/go.mod +++ b/staging/src/k8s.io/csi-translation-lib/go.mod @@ -2,7 +2,7 @@ module k8s.io/csi-translation-lib -go 1.22.0 +go 1.23.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/staging/src/k8s.io/dynamic-resource-allocation/go.mod b/staging/src/k8s.io/dynamic-resource-allocation/go.mod index 866ae56f24c..8131cabfe34 100644 --- a/staging/src/k8s.io/dynamic-resource-allocation/go.mod +++ b/staging/src/k8s.io/dynamic-resource-allocation/go.mod @@ -2,7 +2,7 @@ module k8s.io/dynamic-resource-allocation -go 1.22.0 +go 1.23.0 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/staging/src/k8s.io/endpointslice/go.mod b/staging/src/k8s.io/endpointslice/go.mod index 73c5d8de8ed..5d0b3b4fe0b 100644 --- a/staging/src/k8s.io/endpointslice/go.mod +++ b/staging/src/k8s.io/endpointslice/go.mod @@ -2,7 +2,7 @@ module k8s.io/endpointslice -go 1.22.0 +go 1.23.0 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc diff --git a/staging/src/k8s.io/kms/go.mod b/staging/src/k8s.io/kms/go.mod index 5b82469bb4d..3514c792b51 100644 --- a/staging/src/k8s.io/kms/go.mod +++ b/staging/src/k8s.io/kms/go.mod @@ -2,7 +2,7 @@ module k8s.io/kms -go 1.22.0 +go 1.23.0 require ( github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod b/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod index 9b4bf07313a..3664f353ce2 100644 --- a/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod +++ b/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod @@ -1,6 +1,6 @@ module k8s.io/kms/plugins/mock -go 1.22.0 +go 1.23.0 require ( github.com/ThalesIgnite/crypto11 v1.2.5 diff --git a/staging/src/k8s.io/kms/internal/plugins/_mock/go.work b/staging/src/k8s.io/kms/internal/plugins/_mock/go.work index c6e5470a593..7f9e05680c5 100644 --- a/staging/src/k8s.io/kms/internal/plugins/_mock/go.work +++ b/staging/src/k8s.io/kms/internal/plugins/_mock/go.work @@ -1,6 +1,6 @@ // This is a hack, but it prevents go from climbing further and trying to // reconcile the various deps across the "real" modules and this one. -go 1.22.0 +go 1.23.0 use . diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index f11806c4c6e..2e6795c83f0 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -2,7 +2,7 @@ module k8s.io/kube-aggregator -go 1.22.0 +go 1.23.0 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/staging/src/k8s.io/kube-controller-manager/go.mod b/staging/src/k8s.io/kube-controller-manager/go.mod index ddf99639b31..c217fdc4dc1 100644 --- a/staging/src/k8s.io/kube-controller-manager/go.mod +++ b/staging/src/k8s.io/kube-controller-manager/go.mod @@ -2,7 +2,7 @@ module k8s.io/kube-controller-manager -go 1.22.0 +go 1.23.0 require ( k8s.io/apimachinery v0.0.0 diff --git a/staging/src/k8s.io/kube-proxy/go.mod b/staging/src/k8s.io/kube-proxy/go.mod index 17164e9a0ff..69dcf21560c 100644 --- a/staging/src/k8s.io/kube-proxy/go.mod +++ b/staging/src/k8s.io/kube-proxy/go.mod @@ -2,7 +2,7 @@ module k8s.io/kube-proxy -go 1.22.0 +go 1.23.0 require ( k8s.io/apimachinery v0.0.0 diff --git a/staging/src/k8s.io/kube-scheduler/go.mod b/staging/src/k8s.io/kube-scheduler/go.mod index 969db684494..7a3e495caf1 100644 --- a/staging/src/k8s.io/kube-scheduler/go.mod +++ b/staging/src/k8s.io/kube-scheduler/go.mod @@ -2,7 +2,7 @@ module k8s.io/kube-scheduler -go 1.22.0 +go 1.23.0 require ( github.com/google/go-cmp v0.6.0 diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index 866a05d89fb..cbee0bd58ba 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -2,7 +2,7 @@ module k8s.io/kubectl -go 1.22.0 +go 1.23.0 require ( github.com/MakeNowJust/heredoc v1.0.0 diff --git a/staging/src/k8s.io/kubelet/go.mod b/staging/src/k8s.io/kubelet/go.mod index 1d41413ec53..5231a22a38a 100644 --- a/staging/src/k8s.io/kubelet/go.mod +++ b/staging/src/k8s.io/kubelet/go.mod @@ -2,7 +2,7 @@ module k8s.io/kubelet -go 1.22.0 +go 1.23.0 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod index 20a4e400f78..d5dc346c78a 100644 --- a/staging/src/k8s.io/metrics/go.mod +++ b/staging/src/k8s.io/metrics/go.mod @@ -2,7 +2,7 @@ module k8s.io/metrics -go 1.22.0 +go 1.23.0 require ( github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/mount-utils/go.mod b/staging/src/k8s.io/mount-utils/go.mod index d9120b4323a..4527ed01c4e 100644 --- a/staging/src/k8s.io/mount-utils/go.mod +++ b/staging/src/k8s.io/mount-utils/go.mod @@ -2,7 +2,7 @@ module k8s.io/mount-utils -go 1.22.0 +go 1.23.0 require ( github.com/moby/sys/mountinfo v0.7.1 diff --git a/staging/src/k8s.io/pod-security-admission/go.mod b/staging/src/k8s.io/pod-security-admission/go.mod index 72f0b3a5f96..f01a694e1b9 100644 --- a/staging/src/k8s.io/pod-security-admission/go.mod +++ b/staging/src/k8s.io/pod-security-admission/go.mod @@ -2,7 +2,7 @@ module k8s.io/pod-security-admission -go 1.22.0 +go 1.23.0 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod index 8993dbeb298..2dbb7f4cea6 100644 --- a/staging/src/k8s.io/sample-apiserver/go.mod +++ b/staging/src/k8s.io/sample-apiserver/go.mod @@ -2,7 +2,7 @@ module k8s.io/sample-apiserver -go 1.22.0 +go 1.23.0 require ( github.com/google/gofuzz v1.2.0 diff --git a/staging/src/k8s.io/sample-cli-plugin/go.mod b/staging/src/k8s.io/sample-cli-plugin/go.mod index 121d2000b86..7367eadc1e3 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.mod +++ b/staging/src/k8s.io/sample-cli-plugin/go.mod @@ -2,7 +2,7 @@ module k8s.io/sample-cli-plugin -go 1.22.0 +go 1.23.0 require ( github.com/spf13/cobra v1.8.1 diff --git a/staging/src/k8s.io/sample-controller/go.mod b/staging/src/k8s.io/sample-controller/go.mod index 04e24faf6e0..3b82854123e 100644 --- a/staging/src/k8s.io/sample-controller/go.mod +++ b/staging/src/k8s.io/sample-controller/go.mod @@ -2,7 +2,7 @@ module k8s.io/sample-controller -go 1.22.0 +go 1.23.0 require ( golang.org/x/time v0.3.0 diff --git a/vendor/modules.txt b/vendor/modules.txt index f963cc93862..a161255c9a8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1086,39 +1086,39 @@ gopkg.in/yaml.v2 ## explicit gopkg.in/yaml.v3 # k8s.io/api v0.0.0 => ./staging/src/k8s.io/api -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/apiextensions-apiserver v0.0.0 => ./staging/src/k8s.io/apiextensions-apiserver -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/apimachinery v0.0.0 => ./staging/src/k8s.io/apimachinery -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/apiserver v0.0.0 => ./staging/src/k8s.io/apiserver -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/cli-runtime v0.0.0 => ./staging/src/k8s.io/cli-runtime -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/client-go v0.0.0 => ./staging/src/k8s.io/client-go -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/cloud-provider v0.0.0 => ./staging/src/k8s.io/cloud-provider -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/cluster-bootstrap v0.0.0 => ./staging/src/k8s.io/cluster-bootstrap -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/code-generator v0.0.0 => ./staging/src/k8s.io/code-generator -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/component-base v0.0.0 => ./staging/src/k8s.io/component-base -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/component-helpers v0.0.0 => ./staging/src/k8s.io/component-helpers -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/controller-manager v0.0.0 => ./staging/src/k8s.io/controller-manager -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/cri-api v0.0.0 => ./staging/src/k8s.io/cri-api -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/cri-client v0.0.0 => ./staging/src/k8s.io/cri-client -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/csi-translation-lib v0.0.0 => ./staging/src/k8s.io/csi-translation-lib -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/dynamic-resource-allocation v0.0.0 => ./staging/src/k8s.io/dynamic-resource-allocation -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/endpointslice v0.0.0 => ./staging/src/k8s.io/endpointslice -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 ## explicit; go 1.20 k8s.io/gengo/v2 @@ -1141,11 +1141,11 @@ k8s.io/klog/v2/ktesting/init k8s.io/klog/v2/test k8s.io/klog/v2/textlogger # k8s.io/kms v0.0.0 => ./staging/src/k8s.io/kms -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/kube-controller-manager v0.0.0 => ./staging/src/k8s.io/kube-controller-manager -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 ## explicit; go 1.20 k8s.io/kube-openapi/cmd/openapi-gen @@ -1178,21 +1178,21 @@ 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.22.0 +## explicit; go 1.23.0 # k8s.io/kube-scheduler v0.0.0 => ./staging/src/k8s.io/kube-scheduler -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/metrics v0.0.0 => ./staging/src/k8s.io/metrics -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/mount-utils v0.0.0 => ./staging/src/k8s.io/mount-utils -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/pod-security-admission v0.0.0 => ./staging/src/k8s.io/pod-security-admission -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/sample-apiserver v0.0.0 => ./staging/src/k8s.io/sample-apiserver -## explicit; go 1.22.0 +## explicit; go 1.23.0 # k8s.io/system-validators v1.8.0 ## explicit; go 1.16 k8s.io/system-validators/validators From 102a9dbab1764e8793d0237b25143fa49cd96831 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 10 Sep 2024 12:22:40 -0400 Subject: [PATCH 2/3] Pin godebug default to go1.23 --- go.mod | 2 ++ go.work | 2 ++ hack/tools/go.mod | 2 ++ hack/tools/go.work | 2 ++ staging/src/k8s.io/api/go.mod | 2 ++ staging/src/k8s.io/apiextensions-apiserver/go.mod | 2 ++ staging/src/k8s.io/apimachinery/go.mod | 2 ++ staging/src/k8s.io/apiserver/go.mod | 2 ++ staging/src/k8s.io/cli-runtime/go.mod | 2 ++ staging/src/k8s.io/client-go/go.mod | 2 ++ staging/src/k8s.io/cloud-provider/go.mod | 2 ++ staging/src/k8s.io/cluster-bootstrap/go.mod | 2 ++ staging/src/k8s.io/code-generator/examples/go.mod | 2 ++ staging/src/k8s.io/code-generator/examples/go.work | 2 ++ staging/src/k8s.io/code-generator/go.mod | 2 ++ staging/src/k8s.io/component-base/go.mod | 2 ++ staging/src/k8s.io/component-helpers/go.mod | 2 ++ staging/src/k8s.io/controller-manager/go.mod | 2 ++ staging/src/k8s.io/cri-api/go.mod | 2 ++ staging/src/k8s.io/cri-client/go.mod | 2 ++ staging/src/k8s.io/csi-translation-lib/go.mod | 2 ++ staging/src/k8s.io/dynamic-resource-allocation/go.mod | 2 ++ staging/src/k8s.io/endpointslice/go.mod | 2 ++ staging/src/k8s.io/kms/go.mod | 2 ++ staging/src/k8s.io/kms/internal/plugins/_mock/go.mod | 2 ++ staging/src/k8s.io/kms/internal/plugins/_mock/go.work | 2 ++ staging/src/k8s.io/kube-aggregator/go.mod | 2 ++ staging/src/k8s.io/kube-controller-manager/go.mod | 2 ++ staging/src/k8s.io/kube-proxy/go.mod | 2 ++ staging/src/k8s.io/kube-scheduler/go.mod | 2 ++ staging/src/k8s.io/kubectl/go.mod | 2 ++ staging/src/k8s.io/kubelet/go.mod | 2 ++ staging/src/k8s.io/metrics/go.mod | 2 ++ staging/src/k8s.io/mount-utils/go.mod | 2 ++ staging/src/k8s.io/pod-security-admission/go.mod | 2 ++ staging/src/k8s.io/sample-apiserver/go.mod | 2 ++ staging/src/k8s.io/sample-cli-plugin/go.mod | 2 ++ staging/src/k8s.io/sample-controller/go.mod | 2 ++ 38 files changed, 76 insertions(+) diff --git a/go.mod b/go.mod index 94053a87adf..b62bb57e05b 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,8 @@ module k8s.io/kubernetes go 1.23.0 +godebug default=go1.23 + require ( bitbucket.org/bertimus9/systemstat v0.5.0 github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab diff --git a/go.work b/go.work index d9a635619a4..e6eec2e4a0a 100644 --- a/go.work +++ b/go.work @@ -2,6 +2,8 @@ go 1.23.0 +godebug default=go1.23 + use ( . ./staging/src/k8s.io/api diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 44d2b8446d4..8d85cc13f24 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -2,6 +2,8 @@ module k8s.io/kubernetes/hack/tools go 1.23.0 +godebug default=go1.23 + require ( github.com/aojea/sloppy-netparser v0.0.0-20210819225411-1b3bd8b3b975 github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c diff --git a/hack/tools/go.work b/hack/tools/go.work index 7f9e05680c5..ec2af5afc1d 100644 --- a/hack/tools/go.work +++ b/hack/tools/go.work @@ -3,4 +3,6 @@ go 1.23.0 +godebug default=go1.23 + use . diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod index 41be0858396..19e117d29f7 100644 --- a/staging/src/k8s.io/api/go.mod +++ b/staging/src/k8s.io/api/go.mod @@ -4,6 +4,8 @@ module k8s.io/api go 1.23.0 +godebug default=go1.23 + require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.9.0 diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index d35b1b484b3..c1f3662464c 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -4,6 +4,8 @@ module k8s.io/apiextensions-apiserver go 1.23.0 +godebug default=go1.23 + require ( github.com/emicklei/go-restful/v3 v3.11.0 github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod index 7dcfca16a0c..ae28f08d169 100644 --- a/staging/src/k8s.io/apimachinery/go.mod +++ b/staging/src/k8s.io/apimachinery/go.mod @@ -4,6 +4,8 @@ module k8s.io/apimachinery go 1.23.0 +godebug default=go1.23 + require ( github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 8d8ad48e7b5..bb8a1d1f43f 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -4,6 +4,8 @@ module k8s.io/apiserver go 1.23.0 +godebug default=go1.23 + require ( github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a github.com/coreos/go-oidc v2.2.1+incompatible diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod index 9581ece0523..29fd1451d8e 100644 --- a/staging/src/k8s.io/cli-runtime/go.mod +++ b/staging/src/k8s.io/cli-runtime/go.mod @@ -4,6 +4,8 @@ module k8s.io/cli-runtime go 1.23.0 +godebug default=go1.23 + require ( github.com/google/gnostic-models v0.6.8 github.com/google/go-cmp v0.6.0 diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index 1f018ac2ed2..4815a883997 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -4,6 +4,8 @@ module k8s.io/client-go go 1.23.0 +godebug default=go1.23 + require ( github.com/gogo/protobuf v1.3.2 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod index 1c173e67ff7..3f45023b828 100644 --- a/staging/src/k8s.io/cloud-provider/go.mod +++ b/staging/src/k8s.io/cloud-provider/go.mod @@ -4,6 +4,8 @@ module k8s.io/cloud-provider go 1.23.0 +godebug default=go1.23 + require ( github.com/google/go-cmp v0.6.0 github.com/spf13/cobra v1.8.1 diff --git a/staging/src/k8s.io/cluster-bootstrap/go.mod b/staging/src/k8s.io/cluster-bootstrap/go.mod index f440ac3221e..6ee5d6b90db 100644 --- a/staging/src/k8s.io/cluster-bootstrap/go.mod +++ b/staging/src/k8s.io/cluster-bootstrap/go.mod @@ -4,6 +4,8 @@ module k8s.io/cluster-bootstrap go 1.23.0 +godebug default=go1.23 + require ( github.com/stretchr/testify v1.9.0 gopkg.in/square/go-jose.v2 v2.6.0 diff --git a/staging/src/k8s.io/code-generator/examples/go.mod b/staging/src/k8s.io/code-generator/examples/go.mod index 4a66b3bbe2e..7494428e1f5 100644 --- a/staging/src/k8s.io/code-generator/examples/go.mod +++ b/staging/src/k8s.io/code-generator/examples/go.mod @@ -4,6 +4,8 @@ module k8s.io/code-generator/examples go 1.23.0 +godebug default=go1.23 + require ( k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 diff --git a/staging/src/k8s.io/code-generator/examples/go.work b/staging/src/k8s.io/code-generator/examples/go.work index 7f9e05680c5..ec2af5afc1d 100644 --- a/staging/src/k8s.io/code-generator/examples/go.work +++ b/staging/src/k8s.io/code-generator/examples/go.work @@ -3,4 +3,6 @@ go 1.23.0 +godebug default=go1.23 + use . diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index 0189dda15ba..ee069ffe95b 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -4,6 +4,8 @@ module k8s.io/code-generator go 1.23.0 +godebug default=go1.23 + require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod index edfc6f3f9eb..fd3d5d4331d 100644 --- a/staging/src/k8s.io/component-base/go.mod +++ b/staging/src/k8s.io/component-base/go.mod @@ -4,6 +4,8 @@ module k8s.io/component-base go 1.23.0 +godebug default=go1.23 + require ( github.com/blang/semver/v4 v4.0.0 github.com/go-logr/logr v1.4.2 diff --git a/staging/src/k8s.io/component-helpers/go.mod b/staging/src/k8s.io/component-helpers/go.mod index 0e46e3f61a9..8dc56471a4b 100644 --- a/staging/src/k8s.io/component-helpers/go.mod +++ b/staging/src/k8s.io/component-helpers/go.mod @@ -4,6 +4,8 @@ module k8s.io/component-helpers go 1.23.0 +godebug default=go1.23 + require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod index dac373109d7..67a2d0c7e67 100644 --- a/staging/src/k8s.io/controller-manager/go.mod +++ b/staging/src/k8s.io/controller-manager/go.mod @@ -4,6 +4,8 @@ module k8s.io/controller-manager go 1.23.0 +godebug default=go1.23 + require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 diff --git a/staging/src/k8s.io/cri-api/go.mod b/staging/src/k8s.io/cri-api/go.mod index c630ed02a87..414d6202b4c 100644 --- a/staging/src/k8s.io/cri-api/go.mod +++ b/staging/src/k8s.io/cri-api/go.mod @@ -4,6 +4,8 @@ module k8s.io/cri-api go 1.23.0 +godebug default=go1.23 + require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.9.0 diff --git a/staging/src/k8s.io/cri-client/go.mod b/staging/src/k8s.io/cri-client/go.mod index 986a8d6bde7..21351a70402 100644 --- a/staging/src/k8s.io/cri-client/go.mod +++ b/staging/src/k8s.io/cri-client/go.mod @@ -4,6 +4,8 @@ module k8s.io/cri-client go 1.23.0 +godebug default=go1.23 + require ( github.com/Microsoft/go-winio v0.6.0 github.com/fsnotify/fsnotify v1.7.0 diff --git a/staging/src/k8s.io/csi-translation-lib/go.mod b/staging/src/k8s.io/csi-translation-lib/go.mod index b2c2ac83cb9..315e30ec9b3 100644 --- a/staging/src/k8s.io/csi-translation-lib/go.mod +++ b/staging/src/k8s.io/csi-translation-lib/go.mod @@ -4,6 +4,8 @@ module k8s.io/csi-translation-lib go 1.23.0 +godebug default=go1.23 + require ( github.com/stretchr/testify v1.9.0 k8s.io/api v0.0.0 diff --git a/staging/src/k8s.io/dynamic-resource-allocation/go.mod b/staging/src/k8s.io/dynamic-resource-allocation/go.mod index 8131cabfe34..0afb381be09 100644 --- a/staging/src/k8s.io/dynamic-resource-allocation/go.mod +++ b/staging/src/k8s.io/dynamic-resource-allocation/go.mod @@ -4,6 +4,8 @@ module k8s.io/dynamic-resource-allocation go 1.23.0 +godebug default=go1.23 + require ( github.com/blang/semver/v4 v4.0.0 github.com/go-logr/logr v1.4.2 diff --git a/staging/src/k8s.io/endpointslice/go.mod b/staging/src/k8s.io/endpointslice/go.mod index 5d0b3b4fe0b..a95e6ae842b 100644 --- a/staging/src/k8s.io/endpointslice/go.mod +++ b/staging/src/k8s.io/endpointslice/go.mod @@ -4,6 +4,8 @@ module k8s.io/endpointslice go 1.23.0 +godebug default=go1.23 + require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/google/go-cmp v0.6.0 diff --git a/staging/src/k8s.io/kms/go.mod b/staging/src/k8s.io/kms/go.mod index 3514c792b51..cdc2989dd17 100644 --- a/staging/src/k8s.io/kms/go.mod +++ b/staging/src/k8s.io/kms/go.mod @@ -4,6 +4,8 @@ module k8s.io/kms go 1.23.0 +godebug default=go1.23 + require ( github.com/gogo/protobuf v1.3.2 google.golang.org/grpc v1.65.0 diff --git a/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod b/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod index 3664f353ce2..cfc193c6b68 100644 --- a/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod +++ b/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod @@ -2,6 +2,8 @@ module k8s.io/kms/plugins/mock go 1.23.0 +godebug default=go1.23 + require ( github.com/ThalesIgnite/crypto11 v1.2.5 k8s.io/kms v0.0.0-00010101000000-000000000000 diff --git a/staging/src/k8s.io/kms/internal/plugins/_mock/go.work b/staging/src/k8s.io/kms/internal/plugins/_mock/go.work index 7f9e05680c5..ec2af5afc1d 100644 --- a/staging/src/k8s.io/kms/internal/plugins/_mock/go.work +++ b/staging/src/k8s.io/kms/internal/plugins/_mock/go.work @@ -3,4 +3,6 @@ go 1.23.0 +godebug default=go1.23 + use . diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index 2e6795c83f0..7662d3e8606 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -4,6 +4,8 @@ module k8s.io/kube-aggregator go 1.23.0 +godebug default=go1.23 + require ( github.com/emicklei/go-restful/v3 v3.11.0 github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/kube-controller-manager/go.mod b/staging/src/k8s.io/kube-controller-manager/go.mod index c217fdc4dc1..7858191f361 100644 --- a/staging/src/k8s.io/kube-controller-manager/go.mod +++ b/staging/src/k8s.io/kube-controller-manager/go.mod @@ -4,6 +4,8 @@ module k8s.io/kube-controller-manager go 1.23.0 +godebug default=go1.23 + require ( k8s.io/apimachinery v0.0.0 k8s.io/cloud-provider v0.0.0 diff --git a/staging/src/k8s.io/kube-proxy/go.mod b/staging/src/k8s.io/kube-proxy/go.mod index 69dcf21560c..18c4df278ea 100644 --- a/staging/src/k8s.io/kube-proxy/go.mod +++ b/staging/src/k8s.io/kube-proxy/go.mod @@ -4,6 +4,8 @@ module k8s.io/kube-proxy go 1.23.0 +godebug default=go1.23 + require ( k8s.io/apimachinery v0.0.0 k8s.io/component-base v0.0.0 diff --git a/staging/src/k8s.io/kube-scheduler/go.mod b/staging/src/k8s.io/kube-scheduler/go.mod index 7a3e495caf1..e5e785f7dc0 100644 --- a/staging/src/k8s.io/kube-scheduler/go.mod +++ b/staging/src/k8s.io/kube-scheduler/go.mod @@ -4,6 +4,8 @@ module k8s.io/kube-scheduler go 1.23.0 +godebug default=go1.23 + require ( github.com/google/go-cmp v0.6.0 k8s.io/api v0.0.0 diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index cbee0bd58ba..e4aef33532d 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -4,6 +4,8 @@ module k8s.io/kubectl go 1.23.0 +godebug default=go1.23 + require ( github.com/MakeNowJust/heredoc v1.0.0 github.com/chai2010/gettext-go v1.0.2 diff --git a/staging/src/k8s.io/kubelet/go.mod b/staging/src/k8s.io/kubelet/go.mod index 5231a22a38a..355d09b08ac 100644 --- a/staging/src/k8s.io/kubelet/go.mod +++ b/staging/src/k8s.io/kubelet/go.mod @@ -4,6 +4,8 @@ module k8s.io/kubelet go 1.23.0 +godebug default=go1.23 + require ( github.com/emicklei/go-restful/v3 v3.11.0 github.com/gogo/protobuf v1.3.2 diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod index d5dc346c78a..035f0941607 100644 --- a/staging/src/k8s.io/metrics/go.mod +++ b/staging/src/k8s.io/metrics/go.mod @@ -4,6 +4,8 @@ module k8s.io/metrics go 1.23.0 +godebug default=go1.23 + require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.9.0 diff --git a/staging/src/k8s.io/mount-utils/go.mod b/staging/src/k8s.io/mount-utils/go.mod index 4527ed01c4e..6a8964a7b36 100644 --- a/staging/src/k8s.io/mount-utils/go.mod +++ b/staging/src/k8s.io/mount-utils/go.mod @@ -4,6 +4,8 @@ module k8s.io/mount-utils go 1.23.0 +godebug default=go1.23 + require ( github.com/moby/sys/mountinfo v0.7.1 github.com/opencontainers/runc v1.1.14 diff --git a/staging/src/k8s.io/pod-security-admission/go.mod b/staging/src/k8s.io/pod-security-admission/go.mod index f01a694e1b9..5586ad50925 100644 --- a/staging/src/k8s.io/pod-security-admission/go.mod +++ b/staging/src/k8s.io/pod-security-admission/go.mod @@ -4,6 +4,8 @@ module k8s.io/pod-security-admission go 1.23.0 +godebug default=go1.23 + require ( github.com/blang/semver/v4 v4.0.0 github.com/google/go-cmp v0.6.0 diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod index 2dbb7f4cea6..dd63216c2b0 100644 --- a/staging/src/k8s.io/sample-apiserver/go.mod +++ b/staging/src/k8s.io/sample-apiserver/go.mod @@ -4,6 +4,8 @@ module k8s.io/sample-apiserver go 1.23.0 +godebug default=go1.23 + require ( github.com/google/gofuzz v1.2.0 github.com/spf13/cobra v1.8.1 diff --git a/staging/src/k8s.io/sample-cli-plugin/go.mod b/staging/src/k8s.io/sample-cli-plugin/go.mod index 7367eadc1e3..eacc11c088e 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.mod +++ b/staging/src/k8s.io/sample-cli-plugin/go.mod @@ -4,6 +4,8 @@ module k8s.io/sample-cli-plugin go 1.23.0 +godebug default=go1.23 + require ( github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 diff --git a/staging/src/k8s.io/sample-controller/go.mod b/staging/src/k8s.io/sample-controller/go.mod index 3b82854123e..daf44ec57ee 100644 --- a/staging/src/k8s.io/sample-controller/go.mod +++ b/staging/src/k8s.io/sample-controller/go.mod @@ -4,6 +4,8 @@ module k8s.io/sample-controller go 1.23.0 +godebug default=go1.23 + require ( golang.org/x/time v0.3.0 k8s.io/api v0.0.0 From e7957232cfcfaad1da50252653dea94ac22dc681 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 11 Sep 2024 15:38:38 -0400 Subject: [PATCH 3/3] Update k8s.io/gengo/v2 --- go.mod | 2 +- go.sum | 4 +-- .../src/k8s.io/apiextensions-apiserver/go.mod | 2 +- .../src/k8s.io/apiextensions-apiserver/go.sum | 4 +-- staging/src/k8s.io/code-generator/go.mod | 2 +- staging/src/k8s.io/code-generator/go.sum | 4 +-- staging/src/k8s.io/kube-aggregator/go.mod | 2 +- staging/src/k8s.io/kube-aggregator/go.sum | 4 +-- staging/src/k8s.io/kubectl/go.sum | 2 +- staging/src/k8s.io/metrics/go.mod | 2 +- staging/src/k8s.io/metrics/go.sum | 4 +-- staging/src/k8s.io/sample-apiserver/go.mod | 2 +- staging/src/k8s.io/sample-apiserver/go.sum | 4 +-- staging/src/k8s.io/sample-controller/go.mod | 2 +- staging/src/k8s.io/sample-controller/go.sum | 4 +-- vendor/k8s.io/gengo/v2/Makefile | 14 ++++++++ vendor/k8s.io/gengo/v2/parser/parse.go | 7 ++++ vendor/k8s.io/gengo/v2/parser/parse_122.go | 33 +++++++++++++++++++ .../k8s.io/gengo/v2/parser/parse_pre_122.go | 30 +++++++++++++++++ vendor/modules.txt | 2 +- 20 files changed, 107 insertions(+), 23 deletions(-) create mode 100644 vendor/k8s.io/gengo/v2/Makefile create mode 100644 vendor/k8s.io/gengo/v2/parser/parse_122.go create mode 100644 vendor/k8s.io/gengo/v2/parser/parse_pre_122.go diff --git a/go.mod b/go.mod index b62bb57e05b..e7c8269b0e6 100644 --- a/go.mod +++ b/go.mod @@ -218,7 +218,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.17.2 // indirect diff --git a/go.sum b/go.sum index e2a278f283d..933ed2a1f15 100644 --- a/go.sum +++ b/go.sum @@ -815,8 +815,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 h1:9zY530GenQ3gZTvS6Tt2ywkiUgDxhHXcdvOOF2ZOLFw= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index c1f3662464c..c7a7c25e91c 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -123,7 +123,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/kms v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.sum b/staging/src/k8s.io/apiextensions-apiserver/go.sum index ed697fb34b9..1beb84c98b1 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.sum +++ b/staging/src/k8s.io/apiextensions-apiserver/go.sum @@ -512,8 +512,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 h1:9zY530GenQ3gZTvS6Tt2ywkiUgDxhHXcdvOOF2ZOLFw= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index ee069ffe95b..174584c0ab6 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -16,7 +16,7 @@ require ( golang.org/x/text v0.17.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/apimachinery v0.0.0 - k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 ) diff --git a/staging/src/k8s.io/code-generator/go.sum b/staging/src/k8s.io/code-generator/go.sum index c4927b44182..30312b9d797 100644 --- a/staging/src/k8s.io/code-generator/go.sum +++ b/staging/src/k8s.io/code-generator/go.sum @@ -139,8 +139,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 h1:9zY530GenQ3gZTvS6Tt2ywkiUgDxhHXcdvOOF2ZOLFw= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index 7662d3e8606..09c043c4fc4 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -105,7 +105,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/kms v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/staging/src/k8s.io/kube-aggregator/go.sum b/staging/src/k8s.io/kube-aggregator/go.sum index c9ba82ea979..1624d559ca3 100644 --- a/staging/src/k8s.io/kube-aggregator/go.sum +++ b/staging/src/k8s.io/kube-aggregator/go.sum @@ -309,8 +309,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 h1:9zY530GenQ3gZTvS6Tt2ywkiUgDxhHXcdvOOF2ZOLFw= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index d6740f72a49..00c301c938a 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -312,7 +312,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod index 035f0941607..cf713a8e7ef 100644 --- a/staging/src/k8s.io/metrics/go.mod +++ b/staging/src/k8s.io/metrics/go.mod @@ -52,7 +52,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect diff --git a/staging/src/k8s.io/metrics/go.sum b/staging/src/k8s.io/metrics/go.sum index 7a9fb35140a..a9a0d9f18c8 100644 --- a/staging/src/k8s.io/metrics/go.sum +++ b/staging/src/k8s.io/metrics/go.sum @@ -158,8 +158,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 h1:9zY530GenQ3gZTvS6Tt2ywkiUgDxhHXcdvOOF2ZOLFw= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod index dd63216c2b0..b272343b488 100644 --- a/staging/src/k8s.io/sample-apiserver/go.mod +++ b/staging/src/k8s.io/sample-apiserver/go.mod @@ -101,7 +101,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.0.0 // indirect - k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kms v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect diff --git a/staging/src/k8s.io/sample-apiserver/go.sum b/staging/src/k8s.io/sample-apiserver/go.sum index 684a2251db6..4e263cae9f6 100644 --- a/staging/src/k8s.io/sample-apiserver/go.sum +++ b/staging/src/k8s.io/sample-apiserver/go.sum @@ -306,8 +306,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 h1:9zY530GenQ3gZTvS6Tt2ywkiUgDxhHXcdvOOF2ZOLFw= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/staging/src/k8s.io/sample-controller/go.mod b/staging/src/k8s.io/sample-controller/go.mod index daf44ec57ee..79c7404f5e5 100644 --- a/staging/src/k8s.io/sample-controller/go.mod +++ b/staging/src/k8s.io/sample-controller/go.mod @@ -53,7 +53,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/staging/src/k8s.io/sample-controller/go.sum b/staging/src/k8s.io/sample-controller/go.sum index b423b856161..b4ad4e818c2 100644 --- a/staging/src/k8s.io/sample-controller/go.sum +++ b/staging/src/k8s.io/sample-controller/go.sum @@ -160,8 +160,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 h1:9zY530GenQ3gZTvS6Tt2ywkiUgDxhHXcdvOOF2ZOLFw= -k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= diff --git a/vendor/k8s.io/gengo/v2/Makefile b/vendor/k8s.io/gengo/v2/Makefile new file mode 100644 index 00000000000..8d0fbdaa8a8 --- /dev/null +++ b/vendor/k8s.io/gengo/v2/Makefile @@ -0,0 +1,14 @@ +all: + go build ./... + +test: + GODEBUG=gotypesalias=0 go test -race ./... -count=1 + GODEBUG=gotypesalias=1 go test -race ./... -count=1 + +# We verify for the maximum version of the go directive as 1.20 +# here because the oldest go directive that exists on our supported +# release branches in k/k is 1.20. +verify: + GODEBUG=gotypesalias=0 ./hack/verify-examples.sh + GODEBUG=gotypesalias=1 ./hack/verify-examples.sh + ./hack/verify-go-directive.sh 1.20 diff --git a/vendor/k8s.io/gengo/v2/parser/parse.go b/vendor/k8s.io/gengo/v2/parser/parse.go index da9488b8e89..d4de19e7699 100644 --- a/vendor/k8s.io/gengo/v2/parser/parse.go +++ b/vendor/k8s.io/gengo/v2/parser/parse.go @@ -29,6 +29,7 @@ import ( "time" "golang.org/x/tools/go/packages" + "k8s.io/gengo/v2/types" "k8s.io/klog/v2" ) @@ -642,6 +643,12 @@ func (p *Parser) walkType(u types.Universe, useName *types.Name, in gotypes.Type name = *useName } + // Handle alias types conditionally on go1.22+. + // Inline this once the minimum supported version is go1.22 + if out := p.walkAliasType(u, in); out != nil { + return out + } + switch t := in.(type) { case *gotypes.Struct: out := u.Type(name) diff --git a/vendor/k8s.io/gengo/v2/parser/parse_122.go b/vendor/k8s.io/gengo/v2/parser/parse_122.go new file mode 100644 index 00000000000..ec2064958a9 --- /dev/null +++ b/vendor/k8s.io/gengo/v2/parser/parse_122.go @@ -0,0 +1,33 @@ +//go:build go1.22 +// +build go1.22 + +/* +Copyright 2024 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package parser + +import ( + gotypes "go/types" + + "k8s.io/gengo/v2/types" +) + +func (p *Parser) walkAliasType(u types.Universe, in gotypes.Type) *types.Type { + if t, isAlias := in.(*gotypes.Alias); isAlias { + return p.walkType(u, nil, gotypes.Unalias(t)) + } + return nil +} diff --git a/vendor/k8s.io/gengo/v2/parser/parse_pre_122.go b/vendor/k8s.io/gengo/v2/parser/parse_pre_122.go new file mode 100644 index 00000000000..6f62100c0a7 --- /dev/null +++ b/vendor/k8s.io/gengo/v2/parser/parse_pre_122.go @@ -0,0 +1,30 @@ +//go:build !go1.22 +// +build !go1.22 + +/* +Copyright 2024 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package parser + +import ( + gotypes "go/types" + + "k8s.io/gengo/v2/types" +) + +func (p *Parser) walkAliasType(u types.Universe, in gotypes.Type) *types.Type { + return nil +} diff --git a/vendor/modules.txt b/vendor/modules.txt index a161255c9a8..13d4cf05d50 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1119,7 +1119,7 @@ gopkg.in/yaml.v3 ## explicit; go 1.23.0 # k8s.io/endpointslice v0.0.0 => ./staging/src/k8s.io/endpointslice ## explicit; go 1.23.0 -# k8s.io/gengo/v2 v2.0.0-20240903080316-fb7743ff00a0 +# k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 ## explicit; go 1.20 k8s.io/gengo/v2 k8s.io/gengo/v2/generator