Skip to content

Commit

Permalink
Merge pull request #46 from s1061123/fix/bump-k8s-ver
Browse files Browse the repository at this point in the history
Bump K8s API version
  • Loading branch information
phoracek authored Apr 19, 2022
2 parents 2fd7267 + c92af22 commit 6ace561
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 76 deletions.
52 changes: 26 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down Expand Up @@ -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
)
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
1 change: 0 additions & 1 deletion vendor/k8s.io/api/policy/v1beta1/generated.proto

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

3 changes: 1 addition & 2 deletions vendor/k8s.io/api/policy/v1beta1/types.go

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

64 changes: 25 additions & 39 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

0 comments on commit 6ace561

Please sign in to comment.