Skip to content

Commit 7abed46

Browse files
1gtm1gtm
authored
[cherry-pick] Update Kubernetes v1.18.9 dependencies (#210) (#211)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 8fa530d commit 7abed46

Some content is hidden

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

76 files changed

+501
-2794
lines changed

‎cmd/stash-mysql/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
2424
"stash.appscode.dev/mysql/pkg"
2525

26-
"github.com/appscode/go/log"
26+
"gomodules.xyz/x/log"
2727
_ "k8s.io/client-go/kubernetes/fake"
2828
_ "k8s.io/client-go/plugin/pkg/client/auth"
2929
"kmodules.xyz/client-go/logs"

‎cmd/stash-mysql/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
v "github.com/appscode/go/version"
20+
v "gomodules.xyz/x/version"
2121
)
2222

2323
var (

‎go.mod

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,27 @@ module stash.appscode.dev/mysql
33
go 1.12
44

55
require (
6-
cloud.google.com/go v0.56.0 // indirect
7-
github.com/Azure/go-autorest/autorest v0.10.2 // indirect
8-
github.com/Azure/go-autorest/autorest/adal v0.8.3 // indirect
9-
github.com/NYTimes/gziphandler v1.1.1 // indirect
10-
github.com/appscode/go v0.0.0-20200928211031-cc0c23082d91
11-
github.com/blang/semver v3.5.1+incompatible // indirect
126
github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
137
github.com/go-openapi/spec v0.19.8
14-
github.com/go-openapi/swag v0.19.9 // indirect
158
github.com/gogo/protobuf v1.3.1
169
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
17-
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
1810
github.com/google/gofuzz v1.1.0
19-
github.com/googleapis/gnostic v0.4.0 // indirect
20-
github.com/gophercloud/gophercloud v0.11.0 // indirect
21-
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
22-
github.com/grpc-ecosystem/grpc-gateway v1.14.6 // indirect
23-
github.com/hashicorp/golang-lru v0.5.4 // indirect
24-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
25-
github.com/kr/pretty v0.2.0 // indirect
26-
github.com/mailru/easyjson v0.7.1 // indirect
27-
github.com/mitchellh/mapstructure v1.2.2 // indirect
28-
github.com/prometheus/client_golang v1.6.0 // indirect
2911
github.com/spf13/cobra v1.1.1
3012
github.com/yudai/gojsondiff v1.0.0
3113
go.bytebuilders.dev/license-verifier/kubernetes v0.3.0
32-
go.uber.org/atomic v1.6.0 // indirect
33-
go.uber.org/zap v1.13.0 // indirect
34-
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
35-
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
36-
golang.org/x/tools v0.0.0-20200603131246-cc40288be839 // indirect
37-
google.golang.org/appengine v1.6.6 // indirect
38-
google.golang.org/genproto v0.0.0-20200603110839-e855014d5736 // indirect
39-
gopkg.in/yaml.v2 v2.3.0 // indirect
14+
gomodules.xyz/runtime v0.0.0-20201104200926-d838b09dda8b
15+
gomodules.xyz/x v0.0.0-20201105065653-91c568df6331
4016
k8s.io/api v0.18.9
4117
k8s.io/apiextensions-apiserver v0.18.9
4218
k8s.io/apimachinery v0.18.9
4319
k8s.io/client-go v0.18.9
4420
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
45-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect
4621
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
4722
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
4823
kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
49-
kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a // indirect
5024
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
51-
kmodules.xyz/prober v0.0.0-20201105074402-a243b3a27fd8 // indirect
5225
sigs.k8s.io/yaml v1.2.0
53-
stash.appscode.dev/apimachinery v0.11.3
26+
stash.appscode.dev/apimachinery v0.11.6-0.20201106214826-132a511faa97
5427
)
5528

5629
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
@@ -83,6 +56,26 @@ replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logg
8356

8457
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.5.0
8558

59+
replace github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5
60+
61+
replace github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2
62+
63+
replace github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.3
64+
65+
replace github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.3
66+
67+
replace github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4
68+
69+
replace github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.4
70+
71+
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3
72+
73+
replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.3
74+
75+
replace github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.5
76+
77+
replace github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.5
78+
8679
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
8780

8881
replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2

‎go.sum

Lines changed: 5 additions & 71 deletions
Large diffs are not rendered by default.

‎hack/gencrd/main.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"stash.appscode.dev/mysql/apis/installer/install"
2525
api "stash.appscode.dev/mysql/apis/installer/v1alpha1"
2626

27-
gort "github.com/appscode/go/runtime"
2827
"github.com/go-openapi/spec"
2928
"github.com/golang/glog"
29+
gort "gomodules.xyz/runtime"
3030
"k8s.io/apimachinery/pkg/runtime"
3131
"k8s.io/apimachinery/pkg/runtime/serializer"
3232
"k8s.io/kube-openapi/pkg/common"
@@ -48,17 +48,13 @@ func generateSwaggerJson() {
4848
Title: "Stash",
4949
Version: "v0",
5050
Contact: &spec.ContactInfo{
51-
ContactInfoProps: spec.ContactInfoProps{
52-
Name: "AppsCode Inc.",
53-
URL: "https://appscode.com",
54-
Email: "hello@appscode.com",
55-
},
51+
Name: "AppsCode Inc.",
52+
URL: "https://appscode.com",
53+
Email: "hello@appscode.com",
5654
},
5755
License: &spec.License{
58-
LicenseProps: spec.LicenseProps{
59-
Name: "Apache 2.0",
60-
URL: "https://www.apache.org/licenses/LICENSE-2.0.html",
61-
},
56+
Name: "Apache 2.0",
57+
URL: "https://www.apache.org/licenses/LICENSE-2.0.html",
6258
},
6359
},
6460
OpenAPIDefinitions: []common.GetOpenAPIDefinitions{

‎pkg/backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"stash.appscode.dev/apimachinery/pkg/restic"
2727
api_util "stash.appscode.dev/apimachinery/pkg/util"
2828

29-
"github.com/appscode/go/flags"
3029
"github.com/spf13/cobra"
3130
license "go.bytebuilders.dev/license-verifier/kubernetes"
31+
"gomodules.xyz/x/flags"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/client-go/kubernetes"
3434
"k8s.io/client-go/tools/clientcmd"

‎pkg/restore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
api_v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1"
2525
"stash.appscode.dev/apimachinery/pkg/restic"
2626

27-
"github.com/appscode/go/flags"
2827
"github.com/spf13/cobra"
2928
license "go.bytebuilders.dev/license-verifier/kubernetes"
29+
"gomodules.xyz/x/flags"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/client-go/kubernetes"
3232
"k8s.io/client-go/tools/clientcmd"

‎pkg/root.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121

2222
"stash.appscode.dev/apimachinery/client/clientset/versioned/scheme"
2323

24-
"github.com/appscode/go/flags"
25-
v "github.com/appscode/go/version"
2624
"github.com/spf13/cobra"
25+
"gomodules.xyz/x/flags"
26+
v "gomodules.xyz/x/version"
2727
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
2828
"kmodules.xyz/client-go/logs"
2929
"kmodules.xyz/client-go/tools/cli"

‎pkg/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
stash "stash.appscode.dev/apimachinery/client/clientset/versioned"
2323
"stash.appscode.dev/apimachinery/pkg/restic"
2424

25-
"github.com/appscode/go/log"
2625
"github.com/codeskyblue/go-sh"
26+
"gomodules.xyz/x/log"
2727
core "k8s.io/api/core/v1"
2828
"k8s.io/client-go/kubernetes"
2929
"kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1"

‎vendor/github.com/appscode/go/encoding/json/types/array_or_int.go

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

0 commit comments

Comments
 (0)