Skip to content

Commit 3334ea0

Browse files
authored
Use k8s 1.21.0 toolchain (#175)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 5b1d7af commit 3334ea0

File tree

405 files changed

+65786
-18757
lines changed

Some content is hidden

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

405 files changed

+65786
-18757
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BIN := installer
2121
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
2222
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false,crdVersions={v1}"
2323
# https://github.com/appscodelabs/gengo-builder
24-
CODE_GENERATOR_IMAGE ?= appscode/gengo:release-1.18
24+
CODE_GENERATOR_IMAGE ?= appscode/gengo:release-1.21
2525
API_GROUPS ?= installer:v1alpha1
2626

2727
# This version-strategy uses git tags to set the version string

charts/stash-community/values.openapiv3_schema.yaml

Lines changed: 288 additions & 18 deletions
Large diffs are not rendered by default.

charts/stash-enterprise/values.openapiv3_schema.yaml

Lines changed: 288 additions & 18 deletions
Large diffs are not rendered by default.

charts/stash/values.openapiv3_schema.yaml

Lines changed: 586 additions & 34 deletions
Large diffs are not rendered by default.

crds/installer.stash.appscode.com_stashcommunitys.yaml

Lines changed: 316 additions & 17 deletions
Large diffs are not rendered by default.

crds/installer.stash.appscode.com_stashenterprises.yaml

Lines changed: 316 additions & 17 deletions
Large diffs are not rendered by default.

crds/installer.stash.appscode.com_stashs.yaml

Lines changed: 668 additions & 34 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 59 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,58 @@ module stash.appscode.dev/installer
33
go 1.16
44

55
require (
6-
github.com/Masterminds/goutils v1.1.1 // indirect
7-
github.com/Masterminds/sprig v2.22.0+incompatible
6+
github.com/Masterminds/sprig/v3 v3.2.2
87
github.com/google/gofuzz v1.1.0
9-
github.com/huandu/xstrings v1.3.2 // indirect
10-
github.com/mitchellh/copystructure v1.1.1 // indirect
118
github.com/spf13/pflag v1.0.5
12-
gomodules.xyz/semvers v0.0.0-20210310134147-b22f1a8bc683
13-
k8s.io/api v0.18.9
14-
k8s.io/apimachinery v0.18.9
15-
kmodules.xyz/client-go v0.0.0-20210315112949-a05d2cc96f28
9+
gomodules.xyz/semvers v0.0.0-20210317131320-984e32dd89ca
10+
k8s.io/api v0.21.0
11+
k8s.io/apimachinery v0.21.0
12+
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8
1613
kmodules.xyz/schema-checker v0.1.2
1714
sigs.k8s.io/yaml v1.2.0
1815
)
1916

17+
replace gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.3.0
18+
2019
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
2120

22-
replace cloud.google.com/go => cloud.google.com/go v0.49.0
21+
replace cloud.google.com/go => cloud.google.com/go v0.54.0
2322

24-
replace git.apache.org/thrift.git => github.com/apache/thrift v0.13.0
23+
replace cloud.google.com/go/bigquery => cloud.google.com/go/bigquery v1.4.0
2524

26-
replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v35.0.0+incompatible
25+
replace cloud.google.com/go/datastore => cloud.google.com/go/datastore v1.1.0
2726

28-
replace github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
27+
replace cloud.google.com/go/firestore => cloud.google.com/go/firestore v1.1.0
28+
29+
replace cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.2.0
2930

30-
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.0.0+incompatible
31+
replace cloud.google.com/go/storage => cloud.google.com/go/storage v1.6.0
32+
33+
replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v43.0.0+incompatible
34+
35+
replace github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
3136

32-
replace github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0
37+
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible
3338

34-
replace github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.5.0
39+
replace github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.12
3540

36-
replace github.com/Azure/go-autorest/autorest/azure/auth => github.com/Azure/go-autorest/autorest/azure/auth v0.2.0
41+
replace github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.5
3742

38-
replace github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.1.0
43+
replace github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.3.0
3944

40-
replace github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.2.0
45+
replace github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.4.1
4146

4247
replace github.com/Azure/go-autorest/autorest/to => github.com/Azure/go-autorest/autorest/to v0.2.0
4348

4449
replace github.com/Azure/go-autorest/autorest/validation => github.com/Azure/go-autorest/autorest/validation v0.1.0
4550

46-
replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.1.0
51+
replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.2.0
4752

48-
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.5.0
53+
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.0
54+
55+
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
56+
57+
replace github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
4958

5059
replace github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5
5160

@@ -59,50 +68,58 @@ replace github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4
5968

6069
replace github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.4
6170

62-
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3
71+
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.5
6372

64-
replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.3
73+
replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.5
6574

6675
replace github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.5
6776

68-
replace github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.5
77+
replace github.com/go-openapi/validate => github.com/gomodules/validate v0.19.8-1.16
6978

70-
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
79+
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
7180

72-
replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
81+
replace github.com/golang/protobuf => github.com/golang/protobuf v1.4.3
7382

74-
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
83+
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
7584

7685
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
7786

78-
replace github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.42.0
87+
replace github.com/jetstack/cert-manager => github.com/kmodules/cert-manager v1.3.1-0.20210429172957-c5436c14ce0e
88+
89+
replace github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.47.0
90+
91+
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.0
92+
93+
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.10.0
94+
95+
replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
7996

80-
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.42.0
97+
replace google.golang.org/api => google.golang.org/api v0.20.0
8198

82-
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
99+
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a
83100

84-
replace go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
101+
replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
85102

86-
replace google.golang.org/api => google.golang.org/api v0.14.0
103+
replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210503022716-7e2d4913a125
87104

88-
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9
105+
replace k8s.io/api => k8s.io/api v0.21.0
89106

90-
replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
107+
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.1-rc.0.0.20210405112358-ad4c2289ba4c
91108

92-
replace k8s.io/api => github.com/kmodules/api v0.18.10-0.20200922195318-d60fe725dea0
109+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.1-0.20210427013338-53dee545b83c
93110

94-
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.19.0-alpha.0.0.20200922195535-0c9a1b86beec
111+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
95112

96-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.18.10-0.20200922195747-1bd1cc8f00d1
113+
replace k8s.io/client-go => k8s.io/client-go v0.21.0
97114

98-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.9
115+
replace k8s.io/component-base => k8s.io/component-base v0.21.0
99116

100-
replace k8s.io/client-go => github.com/kmodules/k8s-client-go v0.18.10-0.20200922201634-73fedf3d677e
117+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
101118

102-
replace k8s.io/component-base => k8s.io/component-base v0.18.9
119+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
103120

104-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
121+
replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
105122

106-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.19.0-alpha.0.0.20200922200158-8b13196d8dc4
123+
replace kmodules.xyz/resource-metadata => kmodules.xyz/resource-metadata v0.5.0
107124

108-
replace k8s.io/utils => k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
125+
replace sigs.k8s.io/application => github.com/kmodules/application v0.8.4-0.20210427030912-90eeee3bc4ad

0 commit comments

Comments
 (0)