Skip to content

Commit 8f1a18f

Browse files
authored
Use Kubernetes v1.21.0 toolchain (#119)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 45b1b13 commit 8f1a18f

28 files changed

+809
-22763
lines changed

go.mod

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ require (
1818
k8s.io/client-go v0.21.0
1919
k8s.io/component-base v0.21.0
2020
k8s.io/kubectl v0.21.0
21-
kmodules.xyz/client-go v0.0.0-20210429233600-944c5ec810d6
22-
kmodules.xyz/custom-resources v0.0.0-20210427204948-b63e86e6b5f6 // indirect
23-
kmodules.xyz/objectstore-api v0.0.0-20210427073544-4d4b3fd133fe
24-
kmodules.xyz/offshoot-api v0.0.0-20210427074508-992086875c1e
25-
kmodules.xyz/openshift v0.0.0-20210427090503-74b639d9fc30
26-
kmodules.xyz/prober v0.0.0-20210427091238-7208ea3e0584 // indirect
27-
kmodules.xyz/webhook-runtime v0.0.0-20210427104229-ea46f3f21bbc // indirect
21+
kmodules.xyz/client-go v0.0.0-20210502215034-b73197efff3f
22+
kmodules.xyz/objectstore-api v0.0.0-20210502215550-f5d0292dff17
23+
kmodules.xyz/offshoot-api v0.0.0-20210502215616-234104e66819
24+
kmodules.xyz/openshift v0.0.0-20210502215728-d1a9afb41893
2825
stash.appscode.dev/apimachinery v0.12.3
2926
stash.appscode.dev/stash v0.12.3
3027
)
@@ -69,6 +66,10 @@ replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logg
6966

7067
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.0
7168

69+
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
70+
71+
replace github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
72+
7273
replace github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5
7374

7475
replace github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2
@@ -127,7 +128,7 @@ replace k8s.io/client-go => k8s.io/client-go v0.21.0
127128

128129
replace k8s.io/component-base => k8s.io/component-base v0.21.0
129130

130-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
131+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
131132

132133
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
133134

go.sum

Lines changed: 46 additions & 23 deletions
Large diffs are not rendered by default.

vendor/kmodules.xyz/client-go/go.mod

Lines changed: 104 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ require (
1212
github.com/go-openapi/spec v0.19.5
1313
github.com/gogo/protobuf v1.3.2
1414
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
15-
github.com/google/go-cmp v0.5.2
15+
github.com/google/go-cmp v0.5.4
1616
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
17-
github.com/imdario/mergo v0.3.5
17+
github.com/imdario/mergo v0.3.6
1818
github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
1919
github.com/json-iterator/go v1.1.10
2020
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
2121
github.com/mitchellh/mapstructure v1.1.2
22+
github.com/onsi/gomega v1.8.1 // indirect
2223
github.com/pkg/errors v0.9.1
2324
github.com/spf13/cobra v1.1.1
2425
github.com/spf13/pflag v1.0.5
@@ -30,6 +31,7 @@ require (
3031
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
3132
gomodules.xyz/version v0.1.0
3233
gomodules.xyz/x v0.0.0-20201105065653-91c568df6331
34+
google.golang.org/appengine v1.6.5 // indirect
3335
k8s.io/api v0.21.0
3436
k8s.io/apiextensions-apiserver v0.21.0
3537
k8s.io/apimachinery v0.21.0
@@ -42,6 +44,106 @@ require (
4244
sigs.k8s.io/yaml v1.2.0
4345
)
4446

47+
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
48+
4549
replace cloud.google.com/go => cloud.google.com/go v0.54.0
4650

51+
replace cloud.google.com/go/bigquery => cloud.google.com/go/bigquery v1.4.0
52+
53+
replace cloud.google.com/go/datastore => cloud.google.com/go/datastore v1.1.0
54+
55+
replace cloud.google.com/go/firestore => cloud.google.com/go/firestore v1.1.0
56+
57+
replace cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.2.0
58+
59+
replace cloud.google.com/go/storage => cloud.google.com/go/storage v1.6.0
60+
61+
replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v43.0.0+incompatible
62+
63+
replace github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
64+
65+
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible
66+
67+
replace github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.12
68+
69+
replace github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.5
70+
71+
replace github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.3.0
72+
73+
replace github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.4.1
74+
75+
replace github.com/Azure/go-autorest/autorest/to => github.com/Azure/go-autorest/autorest/to v0.2.0
76+
77+
replace github.com/Azure/go-autorest/autorest/validation => github.com/Azure/go-autorest/autorest/validation v0.1.0
78+
79+
replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.2.0
80+
81+
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.0
82+
83+
replace github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5
84+
85+
replace github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2
86+
87+
replace github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.3
88+
89+
replace github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.3
90+
91+
replace github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4
92+
93+
replace github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.4
94+
95+
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.5
96+
97+
replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.5
98+
99+
replace github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.5
100+
101+
replace github.com/go-openapi/validate => github.com/gomodules/validate v0.19.8-1.16
102+
103+
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
104+
47105
replace github.com/golang/protobuf => github.com/golang/protobuf v1.4.3
106+
107+
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
108+
109+
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
110+
111+
replace github.com/jetstack/cert-manager => github.com/kmodules/cert-manager v1.3.1-0.20210429172957-c5436c14ce0e
112+
113+
replace github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.47.0
114+
115+
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.0
116+
117+
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.10.0
118+
119+
replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
120+
121+
replace google.golang.org/api => google.golang.org/api v0.20.0
122+
123+
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a
124+
125+
replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
126+
127+
replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210427034123-21364f60dbb1
128+
129+
replace k8s.io/api => k8s.io/api v0.21.0
130+
131+
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.1-rc.0.0.20210405112358-ad4c2289ba4c
132+
133+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.1-0.20210427013338-53dee545b83c
134+
135+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
136+
137+
replace k8s.io/client-go => k8s.io/client-go v0.21.0
138+
139+
replace k8s.io/component-base => k8s.io/component-base v0.21.0
140+
141+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
142+
143+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
144+
145+
replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
146+
147+
replace kmodules.xyz/resource-metadata => kmodules.xyz/resource-metadata v0.5.0
148+
149+
replace sigs.k8s.io/application => github.com/kmodules/application v0.8.4-0.20210427030912-90eeee3bc4ad

0 commit comments

Comments
 (0)