Skip to content

Commit d57d978

Browse files
committed
Use k8s 1.25.1 libs
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent f0be472 commit d57d978

File tree

235 files changed

+27042
-968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+27042
-968
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ REPO := $(notdir $(shell pwd))
1919
BIN := webhook-runtime
2020

2121
# https://github.com/appscodelabs/gengo-builder
22-
CODE_GENERATOR_IMAGE ?= appscode/gengo:release-1.24
22+
CODE_GENERATOR_IMAGE ?= appscode/gengo:release-1.25
2323

2424
# This version-strategy uses git tags to set the version string
2525
git_branch := $(shell git rev-parse --abbrev-ref HEAD)

go.mod

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,25 @@ require (
66
github.com/evanphx/json-patch v4.12.0+incompatible
77
github.com/json-iterator/go v1.1.12
88
gomodules.xyz/jsonpatch/v2 v2.2.0
9-
k8s.io/api v0.25.0-rc.1
10-
k8s.io/apimachinery v0.25.0-rc.1
11-
k8s.io/apiserver v0.25.0-rc.1
12-
k8s.io/client-go v0.25.0-rc.1
13-
k8s.io/klog/v2 v2.70.1
14-
k8s.io/kubernetes v0.25.0-rc.1
15-
kmodules.xyz/client-go v0.24.6-0.20220817193607-c52ad2a6e732
16-
kmodules.xyz/openshift v0.24.1-0.20220817201317-4f7bab4999e4
17-
sigs.k8s.io/controller-runtime v0.12.3
9+
k8s.io/api v0.25.1
10+
k8s.io/apimachinery v0.25.1
11+
k8s.io/apiserver v0.25.1
12+
k8s.io/client-go v0.25.1
13+
k8s.io/klog/v2 v2.80.1
14+
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
15+
kmodules.xyz/client-go v0.25.0
16+
kmodules.xyz/openshift v0.25.0
17+
sigs.k8s.io/controller-runtime v0.13.0
1818
)
1919

2020
require (
21+
cloud.google.com/go v0.97.0 // indirect
22+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
23+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
24+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
25+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
26+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
27+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2128
github.com/Masterminds/semver/v3 v3.1.1 // indirect
2229
github.com/PuerkitoBio/purell v1.1.1 // indirect
2330
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -27,53 +34,56 @@ require (
2734
github.com/davecgh/go-spew v1.1.1 // indirect
2835
github.com/docker/distribution v2.8.1+incompatible // indirect
2936
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
37+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3038
github.com/fatih/structs v1.1.0 // indirect
3139
github.com/go-logr/logr v1.2.3 // indirect
3240
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3341
github.com/go-openapi/jsonreference v0.19.5 // indirect
3442
github.com/go-openapi/swag v0.19.14 // indirect
3543
github.com/gogo/protobuf v1.3.2 // indirect
44+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
3645
github.com/golang/protobuf v1.5.2 // indirect
3746
github.com/google/gnostic v0.5.7-v3refs // indirect
38-
github.com/google/go-cmp v0.5.6 // indirect
39-
github.com/google/gofuzz v1.1.0 // indirect
47+
github.com/google/go-cmp v0.5.9 // indirect
48+
github.com/google/gofuzz v1.2.0 // indirect
4049
github.com/google/uuid v1.3.0 // indirect
41-
github.com/imdario/mergo v0.3.12 // indirect
50+
github.com/imdario/mergo v0.3.13 // indirect
4251
github.com/josharian/intern v1.0.0 // indirect
4352
github.com/mailru/easyjson v0.7.6 // indirect
4453
github.com/mattn/go-isatty v0.0.16 // indirect
4554
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
46-
github.com/mitchellh/mapstructure v1.4.1 // indirect
55+
github.com/mitchellh/mapstructure v1.5.0 // indirect
4756
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4857
github.com/modern-go/reflect2 v1.0.2 // indirect
4958
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5059
github.com/opencontainers/go-digest v1.0.0 // indirect
5160
github.com/pkg/errors v0.9.1 // indirect
52-
github.com/prometheus/client_golang v1.12.1 // indirect
61+
github.com/prometheus/client_golang v1.12.2 // indirect
5362
github.com/prometheus/client_model v0.2.0 // indirect
5463
github.com/prometheus/common v0.32.1 // indirect
5564
github.com/prometheus/procfs v0.7.3 // indirect
5665
github.com/sergi/go-diff v1.1.0 // indirect
5766
github.com/spf13/pflag v1.0.5 // indirect
5867
github.com/yudai/gojsondiff v1.0.0 // indirect
5968
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
60-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
69+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
70+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
6171
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
6272
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
6373
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
6474
golang.org/x/text v0.3.7 // indirect
65-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
75+
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
6676
google.golang.org/appengine v1.6.7 // indirect
6777
google.golang.org/protobuf v1.28.0 // indirect
6878
gopkg.in/inf.v0 v0.9.1 // indirect
6979
gopkg.in/yaml.v2 v2.4.0 // indirect
7080
gopkg.in/yaml.v3 v3.0.1 // indirect
71-
k8s.io/component-base v0.25.0-rc.1 // indirect
81+
k8s.io/component-base v0.25.1 // indirect
7282
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
7383
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
7484
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
7585
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7686
sigs.k8s.io/yaml v1.3.0 // indirect
7787
)
7888

79-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.25.0-alpha.0.0.20220817200112-cb8916070941
89+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.26.0-alpha.0.0.20220917022409-54ac9f3f1315

0 commit comments

Comments
 (0)