Skip to content

Commit 12edbc1

Browse files
1gtmtamalsaha
andauthored
[cherry-pick] Use k8s 1.21.1 toolchain (#428) (#429)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent fbbdea8 commit 12edbc1

File tree

99 files changed

+4903
-926
lines changed

Some content is hidden

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

99 files changed

+4903
-926
lines changed

go.mod

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@ module stash.appscode.dev/mysql
33
go 1.15
44

55
require (
6-
cloud.google.com/go v0.58.0 // indirect
76
github.com/spf13/cobra v1.1.3
8-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.1
7+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.2
98
gomodules.xyz/flags v0.1.0
109
gomodules.xyz/go-sh v0.1.0
1110
gomodules.xyz/logs v0.0.2
1211
gomodules.xyz/x v0.0.5
13-
k8s.io/api v0.21.0
14-
k8s.io/apimachinery v0.21.0
15-
k8s.io/client-go v0.21.0
12+
k8s.io/api v0.21.1
13+
k8s.io/apimachinery v0.21.1
14+
k8s.io/client-go v0.21.1
1615
k8s.io/klog/v2 v2.8.0
17-
kmodules.xyz/client-go v0.0.0-20210605021217-cabaee7b953e
18-
kmodules.xyz/custom-resources v0.0.0-20210605111625-741fcb992541
19-
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5
20-
kmodules.xyz/prober v0.0.0-20210504215326-2e406706b970 // indirect
21-
stash.appscode.dev/apimachinery v0.14.0
16+
kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b
17+
kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153
18+
kmodules.xyz/offshoot-api v0.0.0-20210618005544-5217a24765da
19+
stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04
2220
)
2321

2422
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
@@ -89,8 +87,6 @@ replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
8987

9088
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
9189

92-
replace github.com/jetstack/cert-manager => github.com/kmodules/cert-manager v1.3.1-0.20210429172957-c5436c14ce0e
93-
9490
replace github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.47.0
9591

9692
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.0
@@ -107,21 +103,21 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
107103

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

110-
replace k8s.io/api => k8s.io/api v0.21.0
106+
replace k8s.io/api => k8s.io/api v0.21.1
111107

112-
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.1-rc.0.0.20210405112358-ad4c2289ba4c
108+
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.2-rc.0.0.20210617231004-332981b97d2d
113109

114-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.1-0.20210427013338-53dee545b83c
110+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.2-0.20210617231348-daadbf0c8d5e
115111

116-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
112+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.1
117113

118-
replace k8s.io/client-go => k8s.io/client-go v0.21.0
114+
replace k8s.io/client-go => k8s.io/client-go v0.21.1
119115

120-
replace k8s.io/component-base => k8s.io/component-base v0.21.0
116+
replace k8s.io/component-base => k8s.io/component-base v0.21.1
121117

122118
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
123119

124-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
120+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210617232219-a432af45d932
125121

126122
replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
127123

go.sum

Lines changed: 104 additions & 69 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/hashicorp/golang-lru/go.mod

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

vendor/github.com/hashicorp/golang-lru/lru.go

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

vendor/github.com/hashicorp/golang-lru/simplelru/lru.go

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

vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go

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

0 commit comments

Comments
 (0)