Bug 1889955: Bump dependencies to mitigate CVE-2020-8564

[coreydaley]

No description provided.

[openshift-ci-robot]

@coreydaley: This pull request references Bugzilla bug 1889955, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.6.z) matches configured target release for branch (4.6.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1889957 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
• dependent Bugzilla bug 1889957 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
• bug has dependents

In response to this:

Bug 1889955: Bump dependencies to mitigate CVE-2020-8564

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[coreydaley]

/assign @adambkaplan

[coreydaley]

/retest

[coreydaley]

/retest

[adambkaplan]

/lgtm

[adambkaplan]

I see why we don't have this in 4.7 - my fix for Bug 1883803 got rid of the returned error.

See #180

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, coreydaley

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [adambkaplan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-ci-robot]

@coreydaley: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

• openshift/builder#184 is open

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 1889955 has not been moved to the MODIFIED state.

In response to this:

Bug 1889955: Bump dependencies to mitigate CVE-2020-8564

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[coreydaley]

/cherry-pick release-4.5

[openshift-cherrypick-robot]

@coreydaley: #193 failed to apply on top of branch "release-4.5":

Applying: bump (*) to mitigate CVE-2020-8564
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/k8s.io/api/apps/v1beta1/types.go
A	vendor/k8s.io/api/apps/v1beta1/zz_generated.prerelease-lifecycle.go
M	vendor/k8s.io/api/apps/v1beta2/types.go
A	vendor/k8s.io/api/apps/v1beta2/zz_generated.prerelease-lifecycle.go
M	vendor/k8s.io/api/extensions/v1beta1/types.go
A	vendor/k8s.io/api/extensions/v1beta1/zz_generated.prerelease-lifecycle.go
A	vendor/k8s.io/component-base/logs/registry.go
M	vendor/k8s.io/kubernetes/pkg/credentialprovider/config.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/k8s.io/kubernetes/pkg/credentialprovider/config.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kubernetes/pkg/credentialprovider/config.go
CONFLICT (modify/delete): vendor/k8s.io/component-base/logs/registry.go deleted in HEAD and modified in bump (*) to mitigate CVE-2020-8564. Version bump (*) to mitigate CVE-2020-8564 of vendor/k8s.io/component-base/logs/registry.go left in tree.
CONFLICT (modify/delete): vendor/k8s.io/api/extensions/v1beta1/zz_generated.prerelease-lifecycle.go deleted in HEAD and modified in bump (*) to mitigate CVE-2020-8564. Version bump (*) to mitigate CVE-2020-8564 of vendor/k8s.io/api/extensions/v1beta1/zz_generated.prerelease-lifecycle.go left in tree.
Auto-merging vendor/k8s.io/api/extensions/v1beta1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/extensions/v1beta1/types.go
CONFLICT (modify/delete): vendor/k8s.io/api/apps/v1beta2/zz_generated.prerelease-lifecycle.go deleted in HEAD and modified in bump (*) to mitigate CVE-2020-8564. Version bump (*) to mitigate CVE-2020-8564 of vendor/k8s.io/api/apps/v1beta2/zz_generated.prerelease-lifecycle.go left in tree.
Auto-merging vendor/k8s.io/api/apps/v1beta2/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/apps/v1beta2/types.go
CONFLICT (modify/delete): vendor/k8s.io/api/apps/v1beta1/zz_generated.prerelease-lifecycle.go deleted in HEAD and modified in bump (*) to mitigate CVE-2020-8564. Version bump (*) to mitigate CVE-2020-8564 of vendor/k8s.io/api/apps/v1beta1/zz_generated.prerelease-lifecycle.go left in tree.
Auto-merging vendor/k8s.io/api/apps/v1beta1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/apps/v1beta1/types.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bump (*) to mitigate CVE-2020-8564
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.