Skip to content

Commit

Permalink
Merge pull request #189 from gabemontero/k8s-120-bump
Browse files Browse the repository at this point in the history
Bug 1907948: BUILD-149: bump(*): k8s 1.20.1-rc.0
  • Loading branch information
openshift-merge-robot committed Dec 16, 2020
2 parents 7c968f0 + e0576e9 commit 987b47a
Show file tree
Hide file tree
Showing 628 changed files with 37,726 additions and 12,103 deletions.
15 changes: 6 additions & 9 deletions go.mod
Expand Up @@ -7,25 +7,22 @@ require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-logr/logr v0.3.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/gorilla/websocket v1.4.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
github.com/openshift/api v0.0.0-20201117184740-859beeffd973
github.com/openshift/api v0.0.0-20201214114959-164a2fb63b5f
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c
github.com/openshift/library-go v0.0.0-20201102091359-c4fa0f5b3a08
github.com/prometheus/client_golang v1.7.1
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
go.uber.org/zap v1.11.0 // indirect
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
golang.org/x/text v0.3.4 // indirect
k8s.io/api v0.19.4
k8s.io/apimachinery v0.19.4
k8s.io/client-go v0.19.2
k8s.io/component-base v0.19.2
k8s.io/api v0.20.1-rc.0
k8s.io/apimachinery v0.20.1-rc.0
k8s.io/apiserver v0.20.1-rc.0 // indirect
k8s.io/client-go v0.20.1-rc.0
k8s.io/component-base v0.20.1-rc.0
k8s.io/klog/v2 v2.4.0
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
)

replace vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
148 changes: 140 additions & 8 deletions go.sum

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions vendor/github.com/blang/semver/.travis.yml

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

5 changes: 4 additions & 1 deletion vendor/github.com/blang/semver/README.md

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

2 changes: 1 addition & 1 deletion vendor/github.com/blang/semver/package.json

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

2 changes: 1 addition & 1 deletion vendor/github.com/golang/protobuf/proto/text_decode.go

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

83 changes: 55 additions & 28 deletions vendor/github.com/google/go-cmp/cmp/compare.go

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

2 changes: 1 addition & 1 deletion vendor/github.com/google/go-cmp/cmp/export_panic.go

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

20 changes: 15 additions & 5 deletions vendor/github.com/google/go-cmp/cmp/export_unsafe.go

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

22 changes: 21 additions & 1 deletion vendor/github.com/google/go-cmp/cmp/internal/diff/diff.go

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

0 comments on commit 987b47a

Please sign in to comment.