Skip to content

Commit

Permalink
Update Kubernetes v1.18.9 dependencies (#123)
Browse files Browse the repository at this point in the history
/cherry-pick

Signed-off-by: 1gtm <[email protected]>
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
1gtm authored Nov 6, 2020
1 parent cc04710 commit 35a3dcf
Show file tree
Hide file tree
Showing 26 changed files with 248 additions and 455 deletions.
23 changes: 21 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require (
github.com/Azure/go-autorest/autorest v0.10.2 // indirect
github.com/Azure/go-autorest/autorest/adal v0.8.3 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/appscode/go v0.0.0-20200928211031-cc0c23082d91
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/go-openapi/spec v0.19.8
github.com/go-openapi/swag v0.19.9 // indirect
Expand All @@ -23,7 +22,6 @@ require (
github.com/imdario/mergo v0.3.6 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kr/pretty v0.2.0 // indirect
github.com/mailru/easyjson v0.7.1 // indirect
github.com/mitchellh/mapstructure v1.2.2 // indirect
github.com/onsi/gomega v1.8.1 // indirect
github.com/prometheus/client_golang v1.6.0 // indirect
Expand All @@ -37,6 +35,7 @@ require (
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
golang.org/x/tools v0.0.0-20200603131246-cc40288be839 // indirect
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209 // indirect
gomodules.xyz/runtime v0.0.0-20201104200926-d838b09dda8b
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/genproto v0.0.0-20200603110839-e855014d5736 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
Expand Down Expand Up @@ -80,6 +79,26 @@ replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logg

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

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

replace github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2

replace github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.3

replace github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.3

replace github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4

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

replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3

replace github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.3

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

replace github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.5

replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1

replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
Expand Down
73 changes: 2 additions & 71 deletions go.sum

Large diffs are not rendered by default.

16 changes: 6 additions & 10 deletions hack/gencrd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"stash.appscode.dev/installer/apis/installer/install"
api "stash.appscode.dev/installer/apis/installer/v1alpha1"

gort "github.com/appscode/go/runtime"
"github.com/go-openapi/spec"
"github.com/golang/glog"
gort "gomodules.xyz/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/kube-openapi/pkg/common"
Expand All @@ -48,17 +48,13 @@ func generateSwaggerJson() {
Title: "Stash",
Version: "v0",
Contact: &spec.ContactInfo{
ContactInfoProps: spec.ContactInfoProps{
Name: "AppsCode Inc.",
URL: "https://appscode.com",
Email: "[email protected]",
},
Name: "AppsCode Inc.",
URL: "https://appscode.com",
Email: "[email protected]",
},
License: &spec.License{
LicenseProps: spec.LicenseProps{
Name: "Apache 2.0",
URL: "https://www.apache.org/licenses/LICENSE-2.0.html",
},
Name: "Apache 2.0",
URL: "https://www.apache.org/licenses/LICENSE-2.0.html",
},
},
OpenAPIDefinitions: []common.GetOpenAPIDefinitions{
Expand Down
5 changes: 0 additions & 5 deletions vendor/github.com/go-openapi/spec/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions vendor/github.com/go-openapi/spec/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions vendor/github.com/go-openapi/spec/bindata.go

Large diffs are not rendered by default.

30 changes: 0 additions & 30 deletions vendor/github.com/go-openapi/spec/contact_info.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions vendor/github.com/go-openapi/spec/expander.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion vendor/github.com/go-openapi/spec/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 27 additions & 2 deletions vendor/github.com/go-openapi/spec/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 0 additions & 30 deletions vendor/github.com/go-openapi/spec/license.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/github.com/go-openapi/spec/ref.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 7 additions & 10 deletions vendor/github.com/go-openapi/spec/schema_loader.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions vendor/github.com/go-openapi/swag/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 35a3dcf

Please sign in to comment.