Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #164 from elmiko/bz1924508-cve2021-3121
Bug 1924508: Bump dependencies to Kubernetes 1.20.6 to mitigate CVE-2021-3121
  • Loading branch information
openshift-merge-robot committed May 21, 2021
2 parents 7215497 + 63d2d48 commit 5f6589d
Show file tree
Hide file tree
Showing 122 changed files with 6,890 additions and 5,022 deletions.
16 changes: 8 additions & 8 deletions go.mod
Expand Up @@ -7,22 +7,22 @@ require (
github.com/go-logr/logr v0.3.0
github.com/onsi/ginkgo v1.14.1
github.com/onsi/gomega v1.10.2
github.com/openshift/api v0.0.0-20201216151826-78a19e96f9eb
github.com/openshift/machine-api-operator v0.2.1-0.20210104142355-8e6ae0acdfcf
github.com/openshift/api v0.0.0-20210428205234-a8389931bee7
github.com/openshift/machine-api-operator v0.2.1-0.20210516083017-bb9e0b5c1170
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
google.golang.org/api v0.33.0

// kube 1.18
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/client-go v0.20.0
// kube
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
sigs.k8s.io/controller-runtime v0.7.0
sigs.k8s.io/controller-tools v0.3.0
sigs.k8s.io/yaml v1.2.0
)

replace (
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201130182513-88b90230f2a4
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210430231032-3967c2861801
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210318155632-e744815d9f05
)
174 changes: 30 additions & 144 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.

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.

0 comments on commit 5f6589d

Please sign in to comment.