Skip to content

Commit

Permalink
[7926] k8s 1.26 (#804)
Browse files Browse the repository at this point in the history 
* [7926] k8s 1.26

* make generate

* Update skv2 after merge

* go mod tidy
  • Loading branch information
@t-edris
t-edris committed May 12, 2023
1 parent a085081 commit 90f3f2d
Show file tree
Hide file tree
Showing 24 changed files with 345 additions and 332 deletions.
62 changes: 30 additions & 32 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ replace (

// skv2 uses a newer version than the imported solo-kit version which causes issues. Replaces the version with the solo-kit version
github.com/pseudomuto/protoc-gen-doc => github.com/pseudomuto/protoc-gen-doc v1.0.0
k8s.io/api => k8s.io/api v0.25.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.8
k8s.io/apimachinery => k8s.io/apimachinery v0.25.8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.8
k8s.io/client-go => k8s.io/client-go v0.25.8
k8s.io/code-generator => k8s.io/code-generator v0.25.8
k8s.io/component-base => k8s.io/component-base v0.25.8
k8s.io/api => k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.4
k8s.io/apimachinery => k8s.io/apimachinery v0.26.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.4
k8s.io/client-go => k8s.io/client-go v0.26.4
k8s.io/code-generator => k8s.io/code-generator v0.26.4
k8s.io/component-base => k8s.io/component-base v0.26.4
)

require (
Expand All @@ -28,17 +28,17 @@ require (
github.com/rotisserie/eris v0.4.0
github.com/solo-io/go-utils v0.24.0
github.com/solo-io/protoc-gen-ext v0.0.18
github.com/solo-io/skv2 v0.29.2
github.com/solo-io/skv2 v0.29.7-0.20230421193338-ff4b71e3a12f
github.com/solo-io/solo-kit v0.31.0
golang.org/x/tools v0.6.0
google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1
istio.io/tools v0.0.0-20200918020118-6d0a0e49b5d3
k8s.io/apimachinery v0.25.8
k8s.io/client-go v0.25.8
k8s.io/code-generator v0.25.8
sigs.k8s.io/controller-runtime v0.13.1
k8s.io/apimachinery v0.26.4
k8s.io/client-go v0.26.4
k8s.io/code-generator v0.26.4
sigs.k8s.io/controller-runtime v0.14.4
)

require (
Expand All @@ -47,20 +47,18 @@ require (
github.com/Masterminds/semver v1.4.2 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.1.0 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emicklei/proto v1.6.15 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gertd/go-pluralize v0.1.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gobuffalo/envy v1.8.1 // indirect
github.com/gobuffalo/packd v0.3.0 // indirect
Expand All @@ -86,7 +84,7 @@ require (
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-zglob v0.0.3 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -96,20 +94,20 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pborman/uuid v1.2.0 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/solo-io/anyvendor v0.0.4 // indirect
github.com/solo-io/cue v0.4.6 // indirect
github.com/solo-io/cue v0.4.7 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.21.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
Expand All @@ -119,21 +117,21 @@ require (
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.25.8 // indirect
k8s.io/apiextensions-apiserver v0.25.4 // indirect
k8s.io/component-base v0.25.8 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
k8s.io/api v0.26.4 // indirect
k8s.io/apiextensions-apiserver v0.26.4 // indirect
k8s.io/component-base v0.26.4 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down

0 comments on commit 90f3f2d

Please sign in to comment.