[cherry-pick] Update Kubernetes v1.18.9 dependencies (#591) (#594)

/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
stashed · Nov 7, 2020 · 929b7d9 · 929b7d9
1 parent 2016d66
commit 929b7d9
Show file tree

Hide file tree

Showing 7 changed files with 256 additions and 114 deletions.
diff --git a/go.mod b/go.mod
@@ -11,7 +11,8 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.1.1
 	github.com/yudai/gojsondiff v1.0.0
-	go.bytebuilders.dev/license-verifier/kubernetes v0.3.0
+	go.bytebuilders.dev/license-verifier v0.5.0 // indirect
+	go.bytebuilders.dev/license-verifier/kubernetes v0.5.0
 	gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
 	gomodules.xyz/runtime v0.0.0-20201104200926-d838b09dda8b
 	gomodules.xyz/x v0.0.0-20201105065653-91c568df6331

diff --git a/go.sum b/go.sum
@@ -835,10 +835,11 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf
 github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.bytebuilders.dev/license-verifier v0.3.0 h1:OyxDrV07KfKNh0f+rtvPQYC6BedITIeTIzexW+YiUSs=
-go.bytebuilders.dev/license-verifier v0.3.0/go.mod h1:0zzm7+djZ/Ff41BNZYWH80t9mMb42T3Nx2KqQGV9N8s=
-go.bytebuilders.dev/license-verifier/kubernetes v0.3.0 h1:qj/pfjtG0uvsTasaNt2DkdH6xXcbLeoRS6HQLCi0k+k=
-go.bytebuilders.dev/license-verifier/kubernetes v0.3.0/go.mod h1:7Yy4OHy6+Mx+nox31jzTcxTNZd6KOrKdlMw1d6SyJ4I=
+go.bytebuilders.dev/license-verifier v0.0.5/go.mod h1:0zzm7+djZ/Ff41BNZYWH80t9mMb42T3Nx2KqQGV9N8s=
+go.bytebuilders.dev/license-verifier v0.5.0 h1:vjzwnh0f24ykQXUaWYc5OQ+HIfpyvmPTGJ8PQR3FtnY=
+go.bytebuilders.dev/license-verifier v0.5.0/go.mod h1:0zzm7+djZ/Ff41BNZYWH80t9mMb42T3Nx2KqQGV9N8s=
+go.bytebuilders.dev/license-verifier/kubernetes v0.5.0 h1:ho1x2X32lKP6LMFBDfBFG2xxR3U2kXcZkXl0qrptuPo=
+go.bytebuilders.dev/license-verifier/kubernetes v0.5.0/go.mod h1:HGzFl2VYe7QOYpjN0ui1aRAF3JcUFaCMrenfK2rTPVc=
 go.elastic.co/apm v1.5.0/go.mod h1:OdB9sPtM6Vt7oz3VXt7+KR96i9li74qrxBGHTQygFvk=
 go.elastic.co/apm/module/apmhttp v1.5.0/go.mod h1:1FbmNuyD3ddauwzgVwFB0fqY6KbZt3JkV187tGCYYhY=
 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
 kmodules.xyz/client-go v0.0.0-20200524205059-e986bc44c91b/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
 kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371 h1:PPawDOMyDHGeDPN8j1epNozaIB/Z7MlJsXpwm/r4jgk=
 kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
-kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
 kmodules.xyz/client-go v0.0.0-20200818171030-24b2ce405feb h1:0yIIoTfkhR4JAgx8UyXbP7oAveVAOcf66+D+20Uj/Uc=
 kmodules.xyz/client-go v0.0.0-20200818171030-24b2ce405feb/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
 kmodules.xyz/client-go v0.0.0-20200903033732-dab39b86c81b/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=

diff --git a/vendor/go.bytebuilders.dev/license-verifier/info/lib.go b/vendor/go.bytebuilders.dev/license-verifier/info/lib.go
@@ -19,8 +19,9 @@ package info
 import "strconv"
 
 var (
-	EnforceLicense string
-	LicenseCA      string
+	EnforceLicense       string
+	NoLicenseGracePeriod string
+	LicenseCA            string
 
 	ProductOwnerName string
 	ProductOwnerUID  string
@@ -33,3 +34,8 @@ func SkipLicenseVerification() bool {
 	v, _ := strconv.ParseBool(EnforceLicense)
 	return !v
 }
+
+func EnforceLicenseImmediately() bool {
+	v, _ := strconv.ParseBool(NoLicenseGracePeriod)
+	return v
+}
diff --git a/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod b/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod
@@ -4,13 +4,17 @@ go 1.14
 
 require (
 	github.com/gogo/protobuf v1.3.1
-	go.bytebuilders.dev/license-verifier v0.3.0
+	go.bytebuilders.dev/license-verifier v0.0.5
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
-	k8s.io/api v0.18.3
-	k8s.io/apimachinery v0.18.3
-	k8s.io/apiserver v0.18.3
-	k8s.io/client-go v0.18.3
+	k8s.io/api v0.18.9
+	k8s.io/apimachinery v0.18.9
+	k8s.io/apiserver v0.18.9
+	k8s.io/client-go v0.18.9
 	k8s.io/klog v1.0.0
-	k8s.io/kube-aggregator v0.18.3
-	kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03
+	k8s.io/kube-aggregator v0.18.9
+	kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
 )
+
+replace cloud.google.com/go => cloud.google.com/go v0.38.0
+
+replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2