From c92af2223b675c1de844d84ec35918485b917c34 Mon Sep 17 00:00:00 2001 From: Tomofumi Hayashi Date: Tue, 19 Apr 2022 00:45:03 +0900 Subject: [PATCH] Bump K8s API version --- go.mod | 52 +++++++-------- go.sum | 16 ++--- .../k8s.io/api/policy/v1beta1/generated.proto | 1 - vendor/k8s.io/api/policy/v1beta1/types.go | 3 +- vendor/modules.txt | 64 ++++++++----------- 5 files changed, 60 insertions(+), 76 deletions(-) diff --git a/go.mod b/go.mod index 49a820476..2f2c8672b 100644 --- a/go.mod +++ b/go.mod @@ -10,10 +10,10 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.10.1 golang.org/x/tools v0.1.2 // indirect - k8s.io/api v0.22.7 - k8s.io/apimachinery v0.22.7 - k8s.io/client-go v0.22.7 - k8s.io/code-generator v0.22.7 + k8s.io/api v0.22.8 + k8s.io/apimachinery v0.22.8 + k8s.io/client-go v0.22.8 + k8s.io/code-generator v0.22.8 k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c ) @@ -61,27 +61,27 @@ require ( sigs.k8s.io/yaml v1.2.0 // indirect ) -// Pinned to kubernetes-1.18.3 +// Pinned to kubernetes-1.22.8 replace ( - k8s.io/api => k8s.io/api v0.22.7 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.7 - k8s.io/apimachinery => k8s.io/apimachinery v0.22.7 - k8s.io/apiserver => k8s.io/apiserver v0.22.7 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.7 - k8s.io/client-go => k8s.io/client-go v0.22.7 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.7 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.7 - k8s.io/code-generator => k8s.io/code-generator v0.22.7 - k8s.io/component-base => k8s.io/component-base v0.22.7 - k8s.io/cri-api => k8s.io/cri-api v0.22.7 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.7 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.7 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.7 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.7 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.7 - k8s.io/kubectl => k8s.io/kubectl v0.22.7 - k8s.io/kubelet => k8s.io/kubelet v0.22.7 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.7 - k8s.io/metrics => k8s.io/metrics v0.22.7 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.7 + k8s.io/api => k8s.io/api v0.22.8 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.8 + k8s.io/apimachinery => k8s.io/apimachinery v0.22.8 + k8s.io/apiserver => k8s.io/apiserver v0.22.8 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.8 + k8s.io/client-go => k8s.io/client-go v0.22.8 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.8 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.8 + k8s.io/code-generator => k8s.io/code-generator v0.22.8 + k8s.io/component-base => k8s.io/component-base v0.22.8 + k8s.io/cri-api => k8s.io/cri-api v0.22.8 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.8 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.8 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.8 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.8 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.8 + k8s.io/kubectl => k8s.io/kubectl v0.22.8 + k8s.io/kubelet => k8s.io/kubelet v0.22.8 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.8 + k8s.io/metrics => k8s.io/metrics v0.22.8 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.8 ) diff --git a/go.sum b/go.sum index 649bf25e7..94a9667d3 100644 --- a/go.sum +++ b/go.sum @@ -468,14 +468,14 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.22.7 h1:FcjTxEKE+0AP6ofbjimMJtTmJbSDy0jDePqWqFqNYzg= -k8s.io/api v0.22.7/go.mod h1:7hejA1BgBEiSsWljUyRkIjj+AISXO16IwsaDgFjJsQE= -k8s.io/apimachinery v0.22.7 h1:k+/12sD4rvlHQIYhWVruk7bQXl+ztlfQc8CWZJPRy4I= -k8s.io/apimachinery v0.22.7/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU= -k8s.io/client-go v0.22.7 h1:FYbvWEmzGBqEZKKW5iOA54cmmrUd2++uEMvfGJatYq8= -k8s.io/client-go v0.22.7/go.mod h1:pGU/tWSzzvsYT7M3npHhoZ3Jh9qJTTIvFvDtWuW31dw= -k8s.io/code-generator v0.22.7 h1:arzjOmH0OwnCaVU5KqL+ZA9Xrch+F0Mr6/C3hZxk3js= -k8s.io/code-generator v0.22.7/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU= +k8s.io/api v0.22.8 h1:7Ld6tHuvaYzcQE2axLmomWlhP0fK3vpLfo6fBaNrCIs= +k8s.io/api v0.22.8/go.mod h1:uLlWJNRJ+AYwgAdsNwf0TsD3eByNYW9RlXFmkMdL3yk= +k8s.io/apimachinery v0.22.8 h1:kazMo4/t5ZPI7MwImnCJODZrt1VuwbYBixhTzaNIxsw= +k8s.io/apimachinery v0.22.8/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU= +k8s.io/client-go v0.22.8 h1:dWgwPqpWH/DPLWSczA6b61VxFIILe989MXipoE9332s= +k8s.io/client-go v0.22.8/go.mod h1:dOHOy82WOBz0siYHpVyY7FqTIq+iXFXW3+THFk6qErU= +k8s.io/code-generator v0.22.8 h1:zY8ewErkICvGxSt3aYz8s6AZzmx3oL4QYx9ITNVVFT8= +k8s.io/code-generator v0.22.8/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/vendor/k8s.io/api/policy/v1beta1/generated.proto b/vendor/k8s.io/api/policy/v1beta1/generated.proto index 133ba0493..8a2824b51 100644 --- a/vendor/k8s.io/api/policy/v1beta1/generated.proto +++ b/vendor/k8s.io/api/policy/v1beta1/generated.proto @@ -144,7 +144,6 @@ message PodDisruptionBudgetSpec { // A null selector selects no pods. // An empty selector ({}) also selects no pods, which differs from standard behavior of selecting all pods. // In policy/v1, an empty selector will select all pods in the namespace. - // +patchStrategy=replace // +optional optional k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector selector = 2; diff --git a/vendor/k8s.io/api/policy/v1beta1/types.go b/vendor/k8s.io/api/policy/v1beta1/types.go index 553cb316d..486f93461 100644 --- a/vendor/k8s.io/api/policy/v1beta1/types.go +++ b/vendor/k8s.io/api/policy/v1beta1/types.go @@ -36,9 +36,8 @@ type PodDisruptionBudgetSpec struct { // A null selector selects no pods. // An empty selector ({}) also selects no pods, which differs from standard behavior of selecting all pods. // In policy/v1, an empty selector will select all pods in the namespace. - // +patchStrategy=replace // +optional - Selector *metav1.LabelSelector `json:"selector,omitempty" patchStrategy:"replace" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` // An eviction is allowed if at most "maxUnavailable" pods selected by // "selector" are unavailable after the eviction, i.e. even in absence of diff --git a/vendor/modules.txt b/vendor/modules.txt index cd16f1b86..1a26dd309 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -38,8 +38,6 @@ github.com/go-openapi/jsonpointer # github.com/go-openapi/jsonreference v0.19.5 ## explicit; go 1.13 github.com/go-openapi/jsonreference -# github.com/go-openapi/spec v0.19.3 -## explicit; go 1.13 # github.com/go-openapi/swag v0.19.14 ## explicit; go 1.11 github.com/go-openapi/swag @@ -50,8 +48,6 @@ github.com/gogo/protobuf/sortkeys # github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b ## explicit github.com/golang/glog -# github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da -## explicit # github.com/golang/protobuf v1.5.2 ## explicit; go 1.9 github.com/golang/protobuf/proto @@ -75,8 +71,6 @@ github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/extensions github.com/googleapis/gnostic/jsonschema github.com/googleapis/gnostic/openapiv2 -# github.com/hashicorp/golang-lru v0.5.1 -## explicit # github.com/imdario/mergo v0.3.5 ## explicit github.com/imdario/mergo @@ -146,8 +140,6 @@ github.com/pkg/errors # github.com/spf13/pflag v1.0.5 ## explicit; go 1.12 github.com/spf13/pflag -# golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 -## explicit; go 1.11 # golang.org/x/mod v0.4.2 ## explicit; go 1.12 golang.org/x/mod/module @@ -260,8 +252,6 @@ google.golang.org/protobuf/types/descriptorpb google.golang.org/protobuf/types/known/anypb google.golang.org/protobuf/types/known/durationpb google.golang.org/protobuf/types/known/timestamppb -# gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f -## explicit # gopkg.in/inf.v0 v0.9.1 ## explicit gopkg.in/inf.v0 @@ -274,7 +264,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.22.7 => k8s.io/api v0.22.7 +# k8s.io/api v0.22.8 => k8s.io/api v0.22.8 ## explicit; go 1.16 k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1beta1 @@ -319,7 +309,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.22.7 => k8s.io/apimachinery v0.22.7 +# k8s.io/apimachinery v0.22.8 => k8s.io/apimachinery v0.22.8 ## explicit; go 1.16 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -364,7 +354,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.22.7 => k8s.io/client-go v0.22.7 +# k8s.io/client-go v0.22.8 => k8s.io/client-go v0.22.8 ## explicit; go 1.16 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -526,7 +516,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.22.7 => k8s.io/code-generator v0.22.7 +# k8s.io/code-generator v0.22.8 => k8s.io/code-generator v0.22.8 ## explicit; go 1.16 k8s.io/code-generator k8s.io/code-generator/cmd/client-gen @@ -573,8 +563,6 @@ k8s.io/gengo/generator k8s.io/gengo/namer k8s.io/gengo/parser k8s.io/gengo/types -# k8s.io/klog v1.0.0 -## explicit; go 1.12 # k8s.io/klog/v2 v2.9.0 ## explicit; go 1.13 k8s.io/klog/v2 @@ -593,8 +581,6 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# sigs.k8s.io/structured-merge-diff/v3 v3.0.0 -## explicit; go 1.13 # sigs.k8s.io/structured-merge-diff/v4 v4.2.1 ## explicit; go 1.13 sigs.k8s.io/structured-merge-diff/v4/fieldpath @@ -604,24 +590,24 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# k8s.io/api => k8s.io/api v0.22.7 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.7 -# k8s.io/apimachinery => k8s.io/apimachinery v0.22.7 -# k8s.io/apiserver => k8s.io/apiserver v0.22.7 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.7 -# k8s.io/client-go => k8s.io/client-go v0.22.7 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.7 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.7 -# k8s.io/code-generator => k8s.io/code-generator v0.22.7 -# k8s.io/component-base => k8s.io/component-base v0.22.7 -# k8s.io/cri-api => k8s.io/cri-api v0.22.7 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.7 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.7 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.7 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.7 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.7 -# k8s.io/kubectl => k8s.io/kubectl v0.22.7 -# k8s.io/kubelet => k8s.io/kubelet v0.22.7 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.7 -# k8s.io/metrics => k8s.io/metrics v0.22.7 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.7 +# k8s.io/api => k8s.io/api v0.22.8 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.8 +# k8s.io/apimachinery => k8s.io/apimachinery v0.22.8 +# k8s.io/apiserver => k8s.io/apiserver v0.22.8 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.8 +# k8s.io/client-go => k8s.io/client-go v0.22.8 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.8 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.8 +# k8s.io/code-generator => k8s.io/code-generator v0.22.8 +# k8s.io/component-base => k8s.io/component-base v0.22.8 +# k8s.io/cri-api => k8s.io/cri-api v0.22.8 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.8 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.8 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.8 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.8 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.8 +# k8s.io/kubectl => k8s.io/kubectl v0.22.8 +# k8s.io/kubelet => k8s.io/kubelet v0.22.8 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.8 +# k8s.io/metrics => k8s.io/metrics v0.22.8 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.8