Skip to content

Commit 4d4a1fb

Browse files
tamalsahatamalsaha
committed
Use k8s 1.21.0 toolchain
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 2461f64 commit 4d4a1fb

File tree

2,167 files changed

+248413
-45564
lines changed

Some content is hidden

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

2,167 files changed

+248413
-45564
lines changed

‎cmd/stash-postgres/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
2424
"stash.appscode.dev/postgres/pkg"
2525

26-
"gomodules.xyz/x/log"
2726
_ "k8s.io/client-go/kubernetes/fake"
2827
_ "k8s.io/client-go/plugin/pkg/client/auth"
28+
"k8s.io/klog/v2"
2929
"kmodules.xyz/client-go/logs"
3030
)
3131

@@ -38,6 +38,6 @@ func main() {
3838
}
3939

4040
if err := pkg.NewRootCmd().Execute(); err != nil {
41-
log.Fatalln("error:", err)
41+
klog.Fatalln("error:", err)
4242
}
4343
}

‎go.mod

Lines changed: 64 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,61 @@
11
module stash.appscode.dev/postgres
22

3-
go 1.12
3+
go 1.15
44

55
require (
66
github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
7-
github.com/onsi/ginkgo v1.15.0 // indirect
8-
github.com/onsi/gomega v1.10.5 // indirect
9-
github.com/sergi/go-diff v1.1.0 // indirect
10-
github.com/spf13/cobra v1.1.1
11-
go.bytebuilders.dev/license-verifier/kubernetes v0.8.0
12-
gomodules.xyz/x v0.0.0-20201105065653-91c568df6331
13-
k8s.io/api v0.18.9
14-
k8s.io/apimachinery v0.18.9
15-
k8s.io/client-go v0.18.9
16-
kmodules.xyz/client-go v0.0.0-20210220080427-fd7308e30bb4
17-
kmodules.xyz/custom-resources v0.0.0-20210222235834-b3f8dc56b6a3
18-
kmodules.xyz/offshoot-api v0.0.0-20210220080828-fae1f6c66a89
19-
stash.appscode.dev/apimachinery v0.12.3
7+
github.com/spf13/cobra v1.1.3
8+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.1
9+
gomodules.xyz/x v0.0.3
10+
k8s.io/api v0.21.0
11+
k8s.io/apimachinery v0.21.0
12+
k8s.io/client-go v0.21.0
13+
k8s.io/klog/v2 v2.8.0
14+
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8
15+
kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690
16+
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5
17+
stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82
2018
)
2119

2220
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
2321

24-
replace cloud.google.com/go => cloud.google.com/go v0.49.0
22+
replace cloud.google.com/go => cloud.google.com/go v0.54.0
2523

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

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

30-
replace github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
28+
replace cloud.google.com/go/firestore => cloud.google.com/go/firestore v1.1.0
29+
30+
replace cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.2.0
31+
32+
replace cloud.google.com/go/storage => cloud.google.com/go/storage v1.6.0
3133

32-
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.0.0+incompatible
34+
replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v43.0.0+incompatible
3335

34-
replace github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0
36+
replace github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
37+
38+
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible
3539

36-
replace github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.5.0
40+
replace github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.12
3741

38-
replace github.com/Azure/go-autorest/autorest/azure/auth => github.com/Azure/go-autorest/autorest/azure/auth v0.2.0
42+
replace github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.5
3943

40-
replace github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.1.0
44+
replace github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.3.0
4145

42-
replace github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.2.0
46+
replace github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.4.1
4347

4448
replace github.com/Azure/go-autorest/autorest/to => github.com/Azure/go-autorest/autorest/to v0.2.0
4549

4650
replace github.com/Azure/go-autorest/autorest/validation => github.com/Azure/go-autorest/autorest/validation v0.1.0
4751

48-
replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.1.0
52+
replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.2.0
53+
54+
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.0
4955

50-
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.5.0
56+
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
57+
58+
replace github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
5159

5260
replace github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5
5361

@@ -61,50 +69,58 @@ replace github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4
6169

6270
replace github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.4
6371

64-
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3
72+
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.5
6573

66-
replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.3
74+
replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.5
6775

6876
replace github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.5
6977

70-
replace github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.5
78+
replace github.com/go-openapi/validate => github.com/gomodules/validate v0.19.8-1.16
7179

72-
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
80+
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
7381

74-
replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
82+
replace github.com/golang/protobuf => github.com/golang/protobuf v1.4.3
7583

76-
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
84+
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
7785

7886
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
7987

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

82-
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.42.0
98+
replace google.golang.org/api => google.golang.org/api v0.20.0
8399

84-
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
100+
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a
85101

86-
replace go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
102+
replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
87103

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

90-
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9
106+
replace k8s.io/api => k8s.io/api v0.21.0
91107

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

94-
replace k8s.io/api => github.com/kmodules/api v0.18.10-0.20200922195318-d60fe725dea0
110+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.1-0.20210427013338-53dee545b83c
95111

96-
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.19.0-alpha.0.0.20200922195535-0c9a1b86beec
112+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
97113

98-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.18.10-0.20200922195747-1bd1cc8f00d1
114+
replace k8s.io/client-go => k8s.io/client-go v0.21.0
99115

100-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.9
116+
replace k8s.io/component-base => k8s.io/component-base v0.21.0
101117

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

104-
replace k8s.io/component-base => k8s.io/component-base v0.18.9
120+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
105121

106-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
122+
replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
107123

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

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

0 commit comments

Comments
 (0)