Skip to content

Commit 6b8d1b1

Browse files
authored
[cherry-pick] Update Kubernetes v1.18.9 dependencies (#591) (#592)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 3f6b306 commit 6b8d1b1

File tree

7 files changed

+256
-114
lines changed

7 files changed

+256
-114
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ require (
1111
github.com/pkg/errors v0.9.1
1212
github.com/spf13/cobra v1.1.1
1313
github.com/yudai/gojsondiff v1.0.0
14-
go.bytebuilders.dev/license-verifier/kubernetes v0.3.0
14+
go.bytebuilders.dev/license-verifier v0.5.0 // indirect
15+
go.bytebuilders.dev/license-verifier/kubernetes v0.5.0
1516
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
1617
gomodules.xyz/runtime v0.0.0-20201104200926-d838b09dda8b
1718
gomodules.xyz/x v0.0.0-20201105065653-91c568df6331

go.sum

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -835,10 +835,11 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf
835835
github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
836836
github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
837837
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
838-
go.bytebuilders.dev/license-verifier v0.3.0 h1:OyxDrV07KfKNh0f+rtvPQYC6BedITIeTIzexW+YiUSs=
839-
go.bytebuilders.dev/license-verifier v0.3.0/go.mod h1:0zzm7+djZ/Ff41BNZYWH80t9mMb42T3Nx2KqQGV9N8s=
840-
go.bytebuilders.dev/license-verifier/kubernetes v0.3.0 h1:qj/pfjtG0uvsTasaNt2DkdH6xXcbLeoRS6HQLCi0k+k=
841-
go.bytebuilders.dev/license-verifier/kubernetes v0.3.0/go.mod h1:7Yy4OHy6+Mx+nox31jzTcxTNZd6KOrKdlMw1d6SyJ4I=
838+
go.bytebuilders.dev/license-verifier v0.0.5/go.mod h1:0zzm7+djZ/Ff41BNZYWH80t9mMb42T3Nx2KqQGV9N8s=
839+
go.bytebuilders.dev/license-verifier v0.5.0 h1:vjzwnh0f24ykQXUaWYc5OQ+HIfpyvmPTGJ8PQR3FtnY=
840+
go.bytebuilders.dev/license-verifier v0.5.0/go.mod h1:0zzm7+djZ/Ff41BNZYWH80t9mMb42T3Nx2KqQGV9N8s=
841+
go.bytebuilders.dev/license-verifier/kubernetes v0.5.0 h1:ho1x2X32lKP6LMFBDfBFG2xxR3U2kXcZkXl0qrptuPo=
842+
go.bytebuilders.dev/license-verifier/kubernetes v0.5.0/go.mod h1:HGzFl2VYe7QOYpjN0ui1aRAF3JcUFaCMrenfK2rTPVc=
842843
go.elastic.co/apm v1.5.0/go.mod h1:OdB9sPtM6Vt7oz3VXt7+KR96i9li74qrxBGHTQygFvk=
843844
go.elastic.co/apm/module/apmhttp v1.5.0/go.mod h1:1FbmNuyD3ddauwzgVwFB0fqY6KbZt3JkV187tGCYYhY=
844845
go.elastic.co/apm/module/apmot v1.5.0/go.mod h1:d2KYwhJParTpyw2WnTNy8geNlHKKFX+4oK3YLlsesWE=
@@ -1267,7 +1268,6 @@ kmodules.xyz/client-go v0.0.0-20200522120609-c6430d66212f/go.mod h1:sY/eoe4ktxZE
12671268
kmodules.xyz/client-go v0.0.0-20200524205059-e986bc44c91b/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
12681269
kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371 h1:PPawDOMyDHGeDPN8j1epNozaIB/Z7MlJsXpwm/r4jgk=
12691270
kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
1270-
kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
12711271
kmodules.xyz/client-go v0.0.0-20200818171030-24b2ce405feb h1:0yIIoTfkhR4JAgx8UyXbP7oAveVAOcf66+D+20Uj/Uc=
12721272
kmodules.xyz/client-go v0.0.0-20200818171030-24b2ce405feb/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
12731273
kmodules.xyz/client-go v0.0.0-20200903033732-dab39b86c81b/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=

vendor/go.bytebuilders.dev/license-verifier/info/lib.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ package info
1919
import "strconv"
2020

2121
var (
22-
EnforceLicense string
23-
LicenseCA string
22+
EnforceLicense string
23+
NoLicenseGracePeriod string
24+
LicenseCA string
2425

2526
ProductOwnerName string
2627
ProductOwnerUID string
@@ -33,3 +34,8 @@ func SkipLicenseVerification() bool {
3334
v, _ := strconv.ParseBool(EnforceLicense)
3435
return !v
3536
}
37+
38+
func EnforceLicenseImmediately() bool {
39+
v, _ := strconv.ParseBool(NoLicenseGracePeriod)
40+
return v
41+
}

vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ go 1.14
44

55
require (
66
github.com/gogo/protobuf v1.3.1
7-
go.bytebuilders.dev/license-verifier v0.3.0
7+
go.bytebuilders.dev/license-verifier v0.0.5
88
golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
9-
k8s.io/api v0.18.3
10-
k8s.io/apimachinery v0.18.3
11-
k8s.io/apiserver v0.18.3
12-
k8s.io/client-go v0.18.3
9+
k8s.io/api v0.18.9
10+
k8s.io/apimachinery v0.18.9
11+
k8s.io/apiserver v0.18.9
12+
k8s.io/client-go v0.18.9
1313
k8s.io/klog v1.0.0
14-
k8s.io/kube-aggregator v0.18.3
15-
kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03
14+
k8s.io/kube-aggregator v0.18.9
15+
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
1616
)
17+
18+
replace cloud.google.com/go => cloud.google.com/go v0.38.0
19+
20+
replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2

0 commit comments

Comments
 (0)