OCPBUGS-17309: Updated golang.org/x/net/html dependency.

[jaypoulz]

What type of PR is this?
/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:
Part of the upstream patch: kubernetes-sigs#434

Special notes for your reviewer:

Release note:

none

[openshift-ci-robot]

@jaypoulz: This pull request references Jira Issue OCPBUGS-17309, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @djslavens

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

What type of PR is this?
/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:
Part of the upstream patch: kubernetes-sigs#434

Special notes for your reviewer:

Release note:

none

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.

[jaypoulz]

/cherry-pick release-4.13

[openshift-cherrypick-robot]

@jaypoulz: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.13

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.

[openshift-ci]

@jaypoulz: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

[yussufsh]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jaypoulz, yussufsh

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 [yussufsh]

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

[openshift-ci-robot]

@jaypoulz: Jira Issue OCPBUGS-17309: All pull requests linked via external trackers have merged:

• openshift/ibm-powervs-block-csi-driver#43

Jira Issue OCPBUGS-17309 has been moved to the MODIFIED state.

In response to this:

What type of PR is this?
/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:
Part of the upstream patch: kubernetes-sigs#434

Special notes for your reviewer:

Release note:

none

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.

[openshift-cherrypick-robot]

@jaypoulz: #43 failed to apply on top of branch "release-4.13":

Applying: Updated golang.org/x/net/html dependency.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/golang.org/x/crypto/ssh/common.go
M	vendor/golang.org/x/crypto/ssh/connection.go
M	vendor/golang.org/x/crypto/ssh/keys.go
M	vendor/golang.org/x/crypto/ssh/server.go
M	vendor/golang.org/x/net/http2/transport.go
M	vendor/golang.org/x/sys/unix/mkerrors.sh
M	vendor/golang.org/x/sys/unix/zerrors_linux.go
M	vendor/golang.org/x/sys/windows/service.go
M	vendor/golang.org/x/sys/windows/zsyscall_windows.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/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/service.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/crypto/ssh/server.go
Auto-merging vendor/golang.org/x/crypto/ssh/keys.go
Auto-merging vendor/golang.org/x/crypto/ssh/connection.go
Auto-merging vendor/golang.org/x/crypto/ssh/common.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/crypto/ssh/common.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 Updated golang.org/x/net/html dependency.
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.13

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.

[yussufsh]

Manually cherry-picked into release-4.13 via #44