Skip to content

Commit 6c47a15

Browse files
1gtmtamalsaha
1gtm
and
tamalsaha
authored
[cherry-pick] Use k8s 1.25.1 libs (#643) (#645)
/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 1711019 commit 6c47a15

File tree

608 files changed

+28567
-13847
lines changed

Some content is hidden

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

608 files changed

+28567
-13847
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: 38 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,105 +3,91 @@ module stash.appscode.dev/mysql
33
go 1.18
44

55
require (
6-
github.com/spf13/cobra v1.4.0
7-
go.bytebuilders.dev/license-verifier/kubernetes v0.11.0
6+
github.com/spf13/cobra v1.5.0
7+
go.bytebuilders.dev/license-verifier/kubernetes v0.12.0
88
gomodules.xyz/flags v0.1.3
99
gomodules.xyz/go-sh v0.1.0
1010
gomodules.xyz/logs v0.0.6
1111
gomodules.xyz/x v0.0.14
12-
k8s.io/apimachinery v0.24.3
13-
k8s.io/client-go v0.24.3
14-
k8s.io/klog/v2 v2.70.1
15-
kmodules.xyz/client-go v0.24.5
16-
kmodules.xyz/custom-resources v0.24.1
17-
kmodules.xyz/offshoot-api v0.24.2
18-
stash.appscode.dev/apimachinery v0.22.0
12+
k8s.io/apimachinery v0.25.1
13+
k8s.io/client-go v0.25.1
14+
k8s.io/klog/v2 v2.80.1
15+
kmodules.xyz/client-go v0.25.2
16+
kmodules.xyz/custom-resources v0.25.0
17+
kmodules.xyz/offshoot-api v0.25.0
18+
stash.appscode.dev/apimachinery v0.22.1-0.20220917042332-522f4e18711d
1919
)
2020

2121
require (
22-
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
23-
go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220802031002-926d24a28f5d // indirect
24-
)
25-
26-
require (
27-
cloud.google.com/go v0.81.0 // indirect
22+
cloud.google.com/go v0.97.0 // indirect
2823
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
29-
github.com/Azure/go-autorest/autorest v0.11.22 // indirect
30-
github.com/Azure/go-autorest/autorest/adal v0.9.17 // indirect
24+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
25+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
3126
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
3227
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3328
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3429
github.com/Masterminds/semver/v3 v3.1.1 // indirect
3530
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
3631
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
3732
github.com/davecgh/go-spew v1.1.1 // indirect
38-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
33+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
3934
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
35+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4036
github.com/fatih/structs v1.1.0 // indirect
4137
github.com/go-logr/logr v1.2.3 // indirect
4238
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4339
github.com/go-openapi/jsonreference v0.20.0 // indirect
4440
github.com/go-openapi/swag v0.19.15 // indirect
4541
github.com/gogo/protobuf v1.3.2 // indirect
42+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
4643
github.com/golang/protobuf v1.5.2 // indirect
4744
github.com/google/gnostic v0.5.7-v3refs // indirect
48-
github.com/google/go-cmp v0.5.8 // indirect
45+
github.com/google/go-cmp v0.5.9 // indirect
4946
github.com/google/gofuzz v1.2.0 // indirect
5047
github.com/imdario/mergo v0.3.13 // indirect
5148
github.com/inconshreveable/mousetrap v1.0.0 // indirect
5249
github.com/josharian/intern v1.0.0 // indirect
5350
github.com/json-iterator/go v1.1.12 // indirect
54-
github.com/mailru/easyjson v0.7.7 // indirect
51+
github.com/mailru/easyjson v0.7.6 // indirect
5552
github.com/mitchellh/mapstructure v1.5.0 // indirect
5653
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5754
github.com/modern-go/reflect2 v1.0.2 // indirect
5855
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5956
github.com/pkg/errors v0.9.1 // indirect
60-
github.com/sergi/go-diff v1.2.0 // indirect
57+
github.com/sergi/go-diff v1.1.0 // indirect
6158
github.com/spf13/pflag v1.0.5 // indirect
6259
github.com/yudai/gojsondiff v1.0.0 // indirect
6360
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
64-
go.bytebuilders.dev/license-verifier v0.11.0 // indirect
65-
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
66-
golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
67-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
68-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
61+
go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220917052300-e49b09065bec // indirect
62+
go.bytebuilders.dev/license-verifier v0.12.0 // indirect
63+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
64+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
65+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
66+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
6967
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
7068
golang.org/x/text v0.3.7 // indirect
71-
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
69+
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
7270
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
7371
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
7472
gomodules.xyz/mergo v0.3.13 // indirect
7573
gomodules.xyz/pointer v0.1.0 // indirect
7674
gomodules.xyz/sets v0.2.1 // indirect
7775
gomodules.xyz/wait v0.2.0 // indirect
7876
google.golang.org/appengine v1.6.7 // indirect
79-
google.golang.org/protobuf v1.28.0 // indirect
77+
google.golang.org/protobuf v1.28.1 // indirect
8078
gopkg.in/inf.v0 v0.9.1 // indirect
8179
gopkg.in/yaml.v2 v2.4.0 // indirect
82-
gopkg.in/yaml.v3 v3.0.0 // indirect
83-
k8s.io/api v0.24.3 // indirect
84-
k8s.io/apiextensions-apiserver v0.24.1 // indirect
85-
k8s.io/apiserver v0.24.1 // indirect
86-
k8s.io/kube-aggregator v0.24.1 // indirect
87-
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
88-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
89-
kmodules.xyz/objectstore-api v0.24.0 // indirect
90-
kmodules.xyz/prober v0.24.0 // indirect
91-
sigs.k8s.io/controller-runtime v0.12.3 // indirect
92-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
93-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
80+
gopkg.in/yaml.v3 v3.0.1 // indirect
81+
k8s.io/api v0.25.1 // indirect
82+
k8s.io/apiextensions-apiserver v0.25.1 // indirect
83+
k8s.io/apiserver v0.25.1 // indirect
84+
k8s.io/kube-aggregator v0.25.1 // indirect
85+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
86+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
87+
kmodules.xyz/objectstore-api v0.25.0 // indirect
88+
kmodules.xyz/prober v0.25.0 // indirect
89+
sigs.k8s.io/controller-runtime v0.13.0 // indirect
90+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
91+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9492
sigs.k8s.io/yaml v1.3.0 // indirect
9593
)
96-
97-
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
98-
99-
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
100-
101-
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.12.2-0.20220603144237-6cd001896bf3
102-
103-
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.24.2-rc.0.0.20220603191800-1c7484099dee
104-
105-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.0.0-20220603223637-59dad1716c43
106-
107-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.25.0-alpha.0.0.20220603172133-1c9d09d1b3b8

0 commit comments

Comments
 (0)