Skip to content

Commit

Permalink
Merge pull request #207 from elmiko/bz1924416-cve2021-3121
Browse files Browse the repository at this point in the history
Bug 1924478: Bump dependencies to Kubernetes 1.20.6 to mitigate CVE-2021-3121
  • Loading branch information
openshift-merge-robot committed May 21, 2021
2 parents 4b0831e + 08d8db5 commit a3fecc8
Show file tree
Hide file tree
Showing 75 changed files with 3,399 additions and 3,882 deletions.
14 changes: 8 additions & 6 deletions go.mod
Expand Up @@ -9,18 +9,20 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.3 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/openshift/api v0.0.0-20201216151826-78a19e96f9eb
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
github.com/openshift/library-go v0.0.0-20201215165635-4ee79b1caed5
github.com/openshift/api v0.0.0-20210428205234-a8389931bee7
github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
github.com/openshift/library-go v0.0.0-20210205203934-9eb0d970f2f4
github.com/prometheus/client_golang v1.8.0 // indirect
github.com/stretchr/testify v1.6.1
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/client-go v0.20.0

// k8s
k8s.io/api v0.20.6
k8s.io/apimachinery v0.20.6
k8s.io/client-go v0.20.6
k8s.io/klog/v2 v2.4.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/controller-runtime v0.6.3
Expand Down
109 changes: 24 additions & 85 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/github.com/gogo/protobuf/proto/text_parser.go

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

Large diffs are not rendered by default.

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

28 changes: 28 additions & 0 deletions vendor/github.com/openshift/api/config/v1/types_infrastructure.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.

21 changes: 21 additions & 0 deletions vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.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.

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

78 changes: 5 additions & 73 deletions vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.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/golang.org/x/tools/go/packages/external.go

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

0 comments on commit a3fecc8

Please sign in to comment.