Skip to content

Commit 3f12e46

Browse files
1gtmtamalsaha
andauthored
[cherry-pick] Acquire license from license-proxyserver if available (#1084) (#1090)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 9ec2f29 commit 3f12e46

File tree

207 files changed

+28973
-1540
lines changed

Some content is hidden

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

207 files changed

+28973
-1540
lines changed

go.mod

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,31 @@ go 1.18
44

55
require (
66
github.com/spf13/cobra v1.4.0
7-
go.bytebuilders.dev/license-verifier/kubernetes v0.10.0
7+
go.bytebuilders.dev/license-verifier/kubernetes v0.11.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/api v0.24.1
13-
k8s.io/apimachinery v0.24.1
14-
k8s.io/client-go v0.24.1
15-
k8s.io/klog/v2 v2.60.1
16-
kmodules.xyz/client-go v0.24.3
17-
kmodules.xyz/custom-resources v0.24.0
18-
kmodules.xyz/offshoot-api v0.24.1
19-
stash.appscode.dev/apimachinery v0.21.0
12+
k8s.io/api v0.24.3
13+
k8s.io/apimachinery v0.24.3
14+
k8s.io/client-go v0.24.3
15+
k8s.io/klog/v2 v2.70.1
16+
kmodules.xyz/client-go v0.24.5
17+
kmodules.xyz/custom-resources v0.24.1
18+
kmodules.xyz/offshoot-api v0.24.2
19+
stash.appscode.dev/apimachinery v0.22.0
20+
)
21+
22+
require (
23+
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
24+
go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220802031002-926d24a28f5d // indirect
2025
)
2126

2227
require (
2328
cloud.google.com/go v0.81.0 // indirect
2429
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
25-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
26-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
30+
github.com/Azure/go-autorest/autorest v0.11.22 // indirect
31+
github.com/Azure/go-autorest/autorest/adal v0.9.17 // indirect
2732
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
2833
github.com/Azure/go-autorest/logger v0.2.1 // indirect
2934
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
@@ -34,8 +39,7 @@ require (
3439
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
3540
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3641
github.com/fatih/structs v1.1.0 // indirect
37-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
38-
github.com/go-logr/logr v1.2.0 // indirect
42+
github.com/go-logr/logr v1.2.3 // indirect
3943
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4044
github.com/go-openapi/jsonreference v0.20.0 // indirect
4145
github.com/go-openapi/swag v0.19.15 // indirect
@@ -48,21 +52,21 @@ require (
4852
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4953
github.com/josharian/intern v1.0.0 // indirect
5054
github.com/json-iterator/go v1.1.12 // indirect
51-
github.com/mailru/easyjson v0.7.6 // indirect
55+
github.com/mailru/easyjson v0.7.7 // indirect
5256
github.com/mitchellh/mapstructure v1.5.0 // indirect
5357
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5458
github.com/modern-go/reflect2 v1.0.2 // indirect
5559
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5660
github.com/pkg/errors v0.9.1 // indirect
57-
github.com/sergi/go-diff v1.1.0 // indirect
61+
github.com/sergi/go-diff v1.2.0 // indirect
5862
github.com/spf13/pflag v1.0.5 // indirect
5963
github.com/yudai/gojsondiff v1.0.0 // indirect
6064
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
61-
go.bytebuilders.dev/license-verifier v0.10.0 // indirect
62-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
63-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
64-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
65-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
65+
go.bytebuilders.dev/license-verifier v0.11.0 // indirect
66+
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
67+
golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
68+
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
69+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
6670
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
6771
golang.org/x/text v0.3.7 // indirect
6872
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
@@ -73,7 +77,7 @@ require (
7377
gomodules.xyz/sets v0.2.1 // indirect
7478
gomodules.xyz/wait v0.2.0 // indirect
7579
google.golang.org/appengine v1.6.7 // indirect
76-
google.golang.org/protobuf v1.27.1 // indirect
80+
google.golang.org/protobuf v1.28.0 // indirect
7781
gopkg.in/inf.v0 v0.9.1 // indirect
7882
gopkg.in/yaml.v2 v2.4.0 // indirect
7983
gopkg.in/yaml.v3 v3.0.0 // indirect
@@ -84,10 +88,20 @@ require (
8488
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
8589
kmodules.xyz/objectstore-api v0.24.0 // indirect
8690
kmodules.xyz/prober v0.24.0 // indirect
87-
sigs.k8s.io/controller-runtime v0.12.1 // indirect
91+
sigs.k8s.io/controller-runtime v0.12.3 // indirect
8892
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
8993
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
9094
sigs.k8s.io/yaml v1.3.0 // indirect
9195
)
9296

9397
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)