Skip to content

Commit b2fcf2a

Browse files
1gtmtamalsaha
andauthored
[cherry-pick] Use k8s 1.21.1 toolchain (#994) (#1005)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 4925424 commit b2fcf2a

File tree

95 files changed

+4920
-934
lines changed

Some content is hidden

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

95 files changed

+4920
-934
lines changed

go.mod

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@ module stash.appscode.dev/mongodb
33
go 1.15
44

55
require (
6-
cloud.google.com/go v0.58.0 // indirect
76
github.com/pkg/errors v0.9.1
87
github.com/spf13/cobra v1.1.3
9-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.1
8+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.2
109
gomodules.xyz/flags v0.1.0
1110
gomodules.xyz/go-sh v0.1.0
1211
gomodules.xyz/logs v0.0.2
1312
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
1413
gomodules.xyz/x v0.0.5
15-
k8s.io/api v0.21.0
16-
k8s.io/apimachinery v0.21.0
17-
k8s.io/client-go v0.21.0
14+
k8s.io/api v0.21.1
15+
k8s.io/apimachinery v0.21.1
16+
k8s.io/client-go v0.21.1
1817
k8s.io/klog/v2 v2.8.0
19-
kmodules.xyz/client-go v0.0.0-20210605021217-cabaee7b953e
20-
kmodules.xyz/custom-resources v0.0.0-20210605111625-741fcb992541
21-
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5
22-
kubedb.dev/apimachinery v0.18.1-0.20210605201001-29627ec663dc
23-
stash.appscode.dev/apimachinery v0.14.0
18+
kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b
19+
kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153
20+
kmodules.xyz/offshoot-api v0.0.0-20210618005544-5217a24765da
21+
kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb
22+
stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04
2423
)
2524

2625
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
@@ -91,8 +90,6 @@ replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
9190

9291
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
9392

94-
replace github.com/jetstack/cert-manager => github.com/kmodules/cert-manager v1.3.1-0.20210429172957-c5436c14ce0e
95-
9693
replace github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.47.0
9794

9895
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.0
@@ -109,21 +106,21 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
109106

110107
replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210503022716-7e2d4913a125
111108

112-
replace k8s.io/api => k8s.io/api v0.21.0
109+
replace k8s.io/api => k8s.io/api v0.21.1
113110

114-
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.1-rc.0.0.20210405112358-ad4c2289ba4c
111+
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.2-rc.0.0.20210617231004-332981b97d2d
115112

116-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.1-0.20210427013338-53dee545b83c
113+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.2-0.20210617231348-daadbf0c8d5e
117114

118-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
115+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.1
119116

120-
replace k8s.io/client-go => k8s.io/client-go v0.21.0
117+
replace k8s.io/client-go => k8s.io/client-go v0.21.1
121118

122-
replace k8s.io/component-base => k8s.io/component-base v0.21.0
119+
replace k8s.io/component-base => k8s.io/component-base v0.21.1
123120

124121
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
125122

126-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
123+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210617232219-a432af45d932
127124

128125
replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
129126

go.sum

Lines changed: 136 additions & 91 deletions
Large diffs are not rendered by default.

vendor/github.com/evanphx/json-patch/.travis.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

vendor/github.com/evanphx/json-patch/README.md

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/evanphx/json-patch/merge.go

Lines changed: 18 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/evanphx/json-patch/patch.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/go-cmp/cmp/report_compare.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/go-cmp/cmp/report_slices.go

Lines changed: 21 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.bytebuilders.dev/license-verifier/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ endif
5151
### These variables should not need tweaking.
5252
###
5353

54-
SRC_PKGS := apis # directories which hold app source excluding tests (not vendored)
54+
SRC_PKGS := apis info # directories which hold app source excluding tests (not vendored)
5555
SRC_DIRS := $(SRC_PKGS) *.go # directories which hold app source (not vendored)
5656

5757
DOCKER_PLATFORMS := linux/amd64 linux/arm linux/arm64

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,19 @@ var (
2727

2828
ProductName string // This has been renamed to Features
2929
ProductUID string
30+
31+
prodRegistrationAPIEndpoint string = "https://byte.builders/api/v1/register"
32+
qaRegistrationAPIEndpoint string = "https://appscode.ninja/api/v1/register"
3033
)
3134

3235
func SkipLicenseVerification() bool {
3336
v, _ := strconv.ParseBool(EnforceLicense)
3437
return !v
3538
}
39+
40+
func RegistrationAPIEndpoint() string {
41+
if SkipLicenseVerification() {
42+
return qaRegistrationAPIEndpoint
43+
}
44+
return prodRegistrationAPIEndpoint
45+
}

0 commit comments

Comments
 (0)