Skip to content

Commit

Permalink
Merge pull request #511 from sgreene570/bump-kube-1.20
Browse files Browse the repository at this point in the history
Bug 1906860: Bump for kube 1.20
  • Loading branch information
openshift-merge-robot committed Dec 18, 2020
2 parents 7428f82 + e49ff2b commit bf02250
Show file tree
Hide file tree
Showing 518 changed files with 50,284 additions and 16,478 deletions.
25 changes: 12 additions & 13 deletions go.mod
@@ -1,6 +1,6 @@
module github.com/openshift/cluster-ingress-operator

go 1.13
go 1.15

require (
github.com/Azure/azure-sdk-for-go v30.0.0+incompatible
Expand All @@ -13,7 +13,7 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6
github.com/go-logr/zapr v0.2.0
github.com/google/go-cmp v0.5.1
github.com/google/go-cmp v0.5.2
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/imdario/mergo v0.3.10 // indirect
github.com/kevinburke/go-bindata v3.11.0+incompatible
Expand All @@ -22,21 +22,20 @@ require (
github.com/openshift/library-go v0.0.0-20200423123937-d1360419413d
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/spf13/cobra v1.0.0
github.com/stretchr/testify v1.5.1
github.com/spf13/cobra v1.1.1
github.com/stretchr/testify v1.6.1
github.com/tcnksm/go-httpstat v0.2.1-0.20191008022543-e866bb274419
go.uber.org/zap v1.15.0
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
google.golang.org/api v0.15.0
google.golang.org/api v0.20.0
google.golang.org/appengine v1.6.6 // indirect
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.19.2
k8s.io/apiextensions-apiserver v0.19.0 // indirect
k8s.io/apimachinery v0.19.2
k8s.io/apiserver v0.19.0
k8s.io/client-go v0.19.0
sigs.k8s.io/controller-runtime v0.6.2
sigs.k8s.io/controller-tools v0.3.0
k8s.io/api v0.20.0
k8s.io/apiextensions-apiserver v0.20.0 // indirect
k8s.io/apimachinery v0.20.0
k8s.io/apiserver v0.20.0
k8s.io/client-go v0.20.0
sigs.k8s.io/controller-runtime v0.6.4
sigs.k8s.io/controller-tools v0.4.1
)
244 changes: 212 additions & 32 deletions go.sum

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json

This file was deleted.

41 changes: 17 additions & 24 deletions vendor/cloud.google.com/go/compute/metadata/metadata.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/golang/protobuf/proto/text_decode.go

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

8 changes: 4 additions & 4 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.

5 changes: 4 additions & 1 deletion vendor/github.com/google/go-cmp/cmp/options.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/uuid/README.md

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

7 changes: 4 additions & 3 deletions vendor/github.com/google/uuid/marshal.go

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

12 changes: 6 additions & 6 deletions vendor/github.com/google/uuid/version1.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/google/uuid/version4.go

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

3 changes: 3 additions & 0 deletions vendor/github.com/prometheus/procfs/CODE_OF_CONDUCT.md

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

44 changes: 44 additions & 0 deletions vendor/github.com/prometheus/procfs/cpuinfo.go

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

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

18 changes: 0 additions & 18 deletions vendor/github.com/prometheus/procfs/cpuinfo_mips.go

This file was deleted.

18 changes: 0 additions & 18 deletions vendor/github.com/prometheus/procfs/cpuinfo_mips64le.go

This file was deleted.

18 changes: 0 additions & 18 deletions vendor/github.com/prometheus/procfs/cpuinfo_mipsle.go

This file was deleted.

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

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

18 changes: 0 additions & 18 deletions vendor/github.com/prometheus/procfs/cpuinfo_ppc64le.go

This file was deleted.

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

0 comments on commit bf02250

Please sign in to comment.