Skip to content

Commit c838b45

Browse files
1gtmtamalsaha
1gtm
and
tamalsaha
authored
[cherry-pick] Use k8s 1.25.1 libs (#1621) (#1622)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Signed-off-by: Tamal Saha <tamal@appscode.com> Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 78fb76b commit c838b45

File tree

617 files changed

+30485
-13932
lines changed

Some content is hidden

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

617 files changed

+30485
-13932
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
name: Build
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Set up Go 1.18
16+
- name: Set up Go 1.19
1717
uses: actions/setup-go@v1
1818
with:
19-
go-version: 1.18
19+
go-version: 1.19
2020
id: go
2121

2222
- uses: actions/checkout@v1

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
6868
TAG_PROD := $(TAG)
6969
TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH)
7070

71-
GO_VERSION ?= 1.18
71+
GO_VERSION ?= 1.19
7272
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)
7373

7474
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)

‎go.mod

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,24 @@ go 1.18
44

55
require (
66
github.com/pkg/errors v0.9.1
7-
github.com/spf13/cobra v1.4.0
8-
go.bytebuilders.dev/license-verifier/kubernetes v0.11.0
7+
github.com/spf13/cobra v1.5.0
8+
go.bytebuilders.dev/license-verifier/kubernetes v0.12.0
99
gomodules.xyz/flags v0.1.3
1010
gomodules.xyz/go-sh v0.1.0
1111
gomodules.xyz/logs v0.0.6
1212
gomodules.xyz/pointer v0.1.0
1313
gomodules.xyz/x v0.0.14
14-
k8s.io/api v0.24.3
15-
k8s.io/apimachinery v0.24.3
16-
k8s.io/client-go v0.24.3
17-
k8s.io/klog/v2 v2.70.1
18-
kmodules.xyz/client-go v0.24.5
19-
kmodules.xyz/custom-resources v0.24.1
20-
kmodules.xyz/offshoot-api v0.24.2
21-
kubedb.dev/apimachinery v0.27.1-0.20220616092651-6571aa028218
22-
stash.appscode.dev/apimachinery v0.22.0
14+
k8s.io/api v0.25.1
15+
k8s.io/apimachinery v0.25.1
16+
k8s.io/client-go v0.25.1
17+
k8s.io/klog/v2 v2.80.1
18+
kmodules.xyz/client-go v0.25.2
19+
kmodules.xyz/custom-resources v0.25.0
20+
kmodules.xyz/offshoot-api v0.25.0
21+
kubedb.dev/apimachinery v0.28.4-0.20220918021210-a0b96812228b
22+
stash.appscode.dev/apimachinery v0.22.1-0.20220917042332-522f4e18711d
2323
)
2424

25-
require go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220802031002-926d24a28f5d // indirect
26-
2725
require (
2826
cloud.google.com/go v0.99.0 // indirect
2927
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -36,18 +34,19 @@ require (
3634
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
3735
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
3836
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
40-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
37+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
38+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
39+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4140
github.com/fatih/structs v1.1.0 // indirect
4241
github.com/go-logr/logr v1.2.3 // indirect
4342
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4443
github.com/go-openapi/jsonreference v0.20.0 // indirect
45-
github.com/go-openapi/swag v0.21.1 // indirect
44+
github.com/go-openapi/swag v0.22.3 // indirect
4645
github.com/gogo/protobuf v1.3.2 // indirect
47-
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
46+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
4847
github.com/golang/protobuf v1.5.2 // indirect
4948
github.com/google/gnostic v0.6.9 // indirect
50-
github.com/google/go-cmp v0.5.8 // indirect
49+
github.com/google/go-cmp v0.5.9 // indirect
5150
github.com/google/gofuzz v1.2.0 // indirect
5251
github.com/imdario/mergo v0.3.13 // indirect
5352
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -62,45 +61,34 @@ require (
6261
github.com/spf13/pflag v1.0.5 // indirect
6362
github.com/yudai/gojsondiff v1.0.0 // indirect
6463
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
65-
go.bytebuilders.dev/license-verifier v0.11.0 // indirect
66-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
67-
golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
68-
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 // indirect
69-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
70-
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
64+
go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220917052300-e49b09065bec // indirect
65+
go.bytebuilders.dev/license-verifier v0.12.0 // indirect
66+
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
67+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
68+
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
69+
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
70+
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
7171
golang.org/x/text v0.3.7 // indirect
72-
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
72+
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
7373
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
7474
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
7575
gomodules.xyz/mergo v0.3.13 // indirect
7676
gomodules.xyz/sets v0.2.1 // indirect
7777
gomodules.xyz/wait v0.2.0 // indirect
7878
google.golang.org/appengine v1.6.7 // indirect
79-
google.golang.org/protobuf v1.28.0 // indirect
79+
google.golang.org/protobuf v1.28.1 // indirect
8080
gopkg.in/inf.v0 v0.9.1 // indirect
8181
gopkg.in/yaml.v2 v2.4.0 // indirect
82-
gopkg.in/yaml.v3 v3.0.0 // indirect
83-
k8s.io/apiextensions-apiserver v0.24.1 // indirect
84-
k8s.io/apiserver v0.24.1 // indirect
85-
k8s.io/kube-aggregator v0.24.1 // indirect
86-
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
87-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
88-
kmodules.xyz/objectstore-api v0.24.0 // indirect
89-
kmodules.xyz/prober v0.24.0 // indirect
90-
sigs.k8s.io/controller-runtime v0.12.3 // indirect
91-
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
92-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
82+
gopkg.in/yaml.v3 v3.0.1 // indirect
83+
k8s.io/apiextensions-apiserver v0.25.1 // indirect
84+
k8s.io/apiserver v0.25.1 // indirect
85+
k8s.io/kube-aggregator v0.25.1 // indirect
86+
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
87+
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
88+
kmodules.xyz/objectstore-api v0.25.0 // indirect
89+
kmodules.xyz/prober v0.25.0 // indirect
90+
sigs.k8s.io/controller-runtime v0.13.0 // indirect
91+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
92+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9393
sigs.k8s.io/yaml v1.3.0 // indirect
9494
)
95-
96-
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
97-
98-
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
99-
100-
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.12.2-0.20220603144237-6cd001896bf3
101-
102-
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.24.2-rc.0.0.20220603191800-1c7484099dee
103-
104-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.0.0-20220603223637-59dad1716c43
105-
106-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.25.0-alpha.0.0.20220603172133-1c9d09d1b3b8

0 commit comments

Comments
 (0)