OCPBUGS-30478: Update to cloud.google.com/go/storage v1.39.1

[jstuever]

Update cloud.google.com/go/storage module in order to indirectly update update google.golang.org/protobuf

[openshift-ci-robot]

@jstuever: This pull request references Jira Issue OCPBUGS-30478, 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.16.0) matches configured target version for branch (4.16.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jianping-shu

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

In response to this:

Update cloud.google.com/go/storage module in order to indirectly update update google.golang.org/protobuf

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 openshift-eng/jira-lifecycle-plugin repository.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.56%. Comparing base (58431c4) to head (8086ff1).
Report is 2 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #688      +/-   ##
==========================================
+ Coverage   48.37%   48.56%   +0.19%     
==========================================
  Files          96       96              
  Lines       11792    11912     +120     
==========================================
+ Hits         5704     5785      +81     
- Misses       5455     5490      +35     
- Partials      633      637       +4     

see 1 file with indirect coverage changes

[jianping-shu]

Verified with cluster-bot build.
AWS STS cluster installed successfully.
Regression tested with OCP-36498/34470/48360/50869/64885.

[jstuever]

/cherry-pick release-4.15

[openshift-cherrypick-robot]

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

In response to this:

/cherry-pick release-4.15

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.

[lleshchi]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jstuever, lleshchi

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 [jstuever,lleshchi]

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

[jstuever]

/label acknowledge-critical-fixes-only

[openshift-ci]

@jstuever: 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.

[openshift-ci-robot]

@jstuever: Jira Issue OCPBUGS-30478: All pull requests linked via external trackers have merged:

• openshift/cloud-credential-operator#688

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

In response to this:

Update cloud.google.com/go/storage module in order to indirectly update update google.golang.org/protobuf

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-cherrypick-robot]

@jstuever: #688 failed to apply on top of branch "release-4.15":

Applying: Update cloud.google.com/go/storage module
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/cloud.google.com/go/compute/internal/version.go
M	vendor/cloud.google.com/go/internal/.repo-metadata-full.json
M	vendor/github.com/go-logr/logr/README.md
M	vendor/github.com/go-logr/logr/funcr/funcr.go
M	vendor/github.com/go-logr/logr/logr.go
A	vendor/github.com/go-logr/logr/slogr/sloghandler.go
A	vendor/github.com/go-logr/logr/slogr/slogr.go
A	vendor/github.com/go-logr/logr/slogr/slogsink.go
A	vendor/go.opentelemetry.io/otel/.codespellignore
M	vendor/go.opentelemetry.io/otel/.gitignore
M	vendor/go.opentelemetry.io/otel/.golangci.yml
M	vendor/go.opentelemetry.io/otel/CHANGELOG.md
M	vendor/go.opentelemetry.io/otel/CODEOWNERS
M	vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
M	vendor/go.opentelemetry.io/otel/Makefile
M	vendor/go.opentelemetry.io/otel/README.md
M	vendor/go.opentelemetry.io/otel/RELEASING.md
M	vendor/go.opentelemetry.io/otel/attribute/set.go
M	vendor/go.opentelemetry.io/otel/baggage/baggage.go
A	vendor/go.opentelemetry.io/otel/internal/global/instruments.go
A	vendor/go.opentelemetry.io/otel/internal/global/meter.go
M	vendor/go.opentelemetry.io/otel/internal/global/state.go
A	vendor/go.opentelemetry.io/otel/metric/doc.go
A	vendor/go.opentelemetry.io/otel/metric/instrument.go
A	vendor/go.opentelemetry.io/otel/metric/syncfloat64.go
A	vendor/go.opentelemetry.io/otel/metric/syncint64.go
A	vendor/go.opentelemetry.io/otel/requirements.txt
M	vendor/go.opentelemetry.io/otel/trace/noop.go
M	vendor/go.opentelemetry.io/otel/version.go
M	vendor/go.opentelemetry.io/otel/versions.yaml
M	vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go
M	vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go
M	vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
M	vendor/golang.org/x/net/context/go17.go
M	vendor/golang.org/x/net/context/go19.go
M	vendor/golang.org/x/net/context/pre_go17.go
M	vendor/golang.org/x/net/context/pre_go19.go
A	vendor/golang.org/x/net/html/token.go
M	vendor/golang.org/x/net/http2/transport.go
M	vendor/golang.org/x/sys/unix/aliases.go
M	vendor/golang.org/x/sys/unix/mkerrors.sh
M	vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
M	vendor/golang.org/x/sys/unix/syscall_linux.go
M	vendor/golang.org/x/sys/unix/zerrors_linux.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go.git/rebase-apply/patch:24994: trailing whitespace.
lint-markdown: 
warning: 1 line adds whitespace errors.

M	vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux.go
M	vendor/golang.org/x/sys/windows/syscall_windows.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
Removing vendor/google.golang.org/protobuf/reflect/protodesc/editions_defaults.binpb
Removing vendor/google.golang.org/grpc/resolver_conn_wrapper.go
Removing vendor/google.golang.org/appengine/travis_test.sh
Removing vendor/google.golang.org/appengine/travis_install.sh
Removing vendor/google.golang.org/appengine/socket/socket_vm.go
Removing vendor/google.golang.org/appengine/socket/socket_classic.go
Removing vendor/google.golang.org/appengine/socket/doc.go
Removing vendor/google.golang.org/appengine/internal/socket/socket_service.proto
Removing vendor/google.golang.org/appengine/internal/socket/socket_service.pb.go
Removing vendor/google.golang.org/appengine/.travis.yml
Removing vendor/google.golang.org/api/transport/http/dial_appengine.go
Removing vendor/google.golang.org/api/transport/grpc/dial_appengine.go
Removing vendor/golang.org/x/xerrors/wrap.go
Removing vendor/golang.org/x/xerrors/internal/internal.go
Removing vendor/golang.org/x/xerrors/frame.go
Removing vendor/golang.org/x/xerrors/format.go
Removing vendor/golang.org/x/xerrors/fmt.go
Removing vendor/golang.org/x/xerrors/errors.go
Removing vendor/golang.org/x/xerrors/doc.go
Removing vendor/golang.org/x/xerrors/codereview.cfg
Removing vendor/golang.org/x/xerrors/adaptor.go
Removing vendor/golang.org/x/xerrors/README
Removing vendor/golang.org/x/xerrors/PATENTS
Removing vendor/golang.org/x/xerrors/LICENSE
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/unix/aliases.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/aliases.go
Removing vendor/golang.org/x/oauth2/google/internal/externalaccount/err.go
Removing vendor/golang.org/x/oauth2/google/internal/externalaccount/basecredentials.go
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (modify/delete): vendor/golang.org/x/net/html/token.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/golang.org/x/net/html/token.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/net/context/pre_go19.go deleted in Update cloud.google.com/go/storage module and modified in HEAD. Version HEAD of vendor/golang.org/x/net/context/pre_go19.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/net/context/pre_go17.go deleted in Update cloud.google.com/go/storage module and modified in HEAD. Version HEAD of vendor/golang.org/x/net/context/pre_go17.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/net/context/go19.go deleted in Update cloud.google.com/go/storage module and modified in HEAD. Version HEAD of vendor/golang.org/x/net/context/go19.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/net/context/go17.go deleted in Update cloud.google.com/go/storage module and modified in HEAD. Version HEAD of vendor/golang.org/x/net/context/go17.go left in tree.
Removing vendor/golang.org/x/net/context/context.go
Auto-merging vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go deleted in Update cloud.google.com/go/storage module and modified in HEAD. Version HEAD of vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go deleted in Update cloud.google.com/go/storage module and modified in HEAD. Version HEAD of vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go left in tree.
Auto-merging vendor/go.opentelemetry.io/otel/versions.yaml
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/versions.yaml
Auto-merging vendor/go.opentelemetry.io/otel/version.go
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/version.go
Auto-merging vendor/go.opentelemetry.io/otel/trace/noop.go
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/trace/noop.go
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/requirements.txt deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/requirements.txt left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/syncint64.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/metric/syncint64.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/syncfloat64.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/metric/syncfloat64.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/instrument.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/metric/instrument.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/doc.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/metric/doc.go left in tree.
Auto-merging vendor/go.opentelemetry.io/otel/internal/global/state.go
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/internal/global/state.go
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/meter.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/internal/global/meter.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/instruments.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/internal/global/instruments.go left in tree.
Auto-merging vendor/go.opentelemetry.io/otel/baggage/baggage.go
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/baggage/baggage.go
Auto-merging vendor/go.opentelemetry.io/otel/attribute/set.go
Auto-merging vendor/go.opentelemetry.io/otel/RELEASING.md
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/RELEASING.md
Auto-merging vendor/go.opentelemetry.io/otel/README.md
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/README.md
Auto-merging vendor/go.opentelemetry.io/otel/Makefile
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/Makefile
Auto-merging vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
Auto-merging vendor/go.opentelemetry.io/otel/CODEOWNERS
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/CODEOWNERS
Auto-merging vendor/go.opentelemetry.io/otel/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/CHANGELOG.md
Auto-merging vendor/go.opentelemetry.io/otel/.golangci.yml
Auto-merging vendor/go.opentelemetry.io/otel/.gitignore
CONFLICT (content): Merge conflict in vendor/go.opentelemetry.io/otel/.gitignore
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/.codespellignore deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/go.opentelemetry.io/otel/.codespellignore left in tree.
Removing vendor/github.com/google/uuid/.travis.yml
Removing vendor/github.com/golang/protobuf/jsonpb/json.go
Removing vendor/github.com/golang/protobuf/jsonpb/encode.go
Removing vendor/github.com/golang/protobuf/jsonpb/decode.go
CONFLICT (rename/delete): vendor/github.com/go-logr/logr/slogr/slogsink.go deleted in HEAD and renamed to vendor/github.com/go-logr/logr/slogsink.go in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/github.com/go-logr/logr/slogsink.go left in tree.
CONFLICT (modify/delete): vendor/github.com/go-logr/logr/slogr/slogr.go deleted in HEAD and modified in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/github.com/go-logr/logr/slogr/slogr.go left in tree.
CONFLICT (rename/delete): vendor/github.com/go-logr/logr/slogr/sloghandler.go deleted in HEAD and renamed to vendor/github.com/go-logr/logr/sloghandler.go in Update cloud.google.com/go/storage module. Version Update cloud.google.com/go/storage module of vendor/github.com/go-logr/logr/sloghandler.go left in tree.
Auto-merging vendor/github.com/go-logr/logr/logr.go
Auto-merging vendor/github.com/go-logr/logr/funcr/funcr.go
CONFLICT (content): Merge conflict in vendor/github.com/go-logr/logr/funcr/funcr.go
Auto-merging vendor/github.com/go-logr/logr/README.md
CONFLICT (content): Merge conflict in vendor/github.com/go-logr/logr/README.md
Auto-merging vendor/cloud.google.com/go/internal/.repo-metadata-full.json
Auto-merging vendor/cloud.google.com/go/compute/internal/version.go
CONFLICT (content): Merge conflict in vendor/cloud.google.com/go/compute/internal/version.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 Update cloud.google.com/go/storage module
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.15

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-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cloud-credential-operator-container-v4.16.0-202403180813.p0.g9bad012.assembly.stream.el8 for distgit ose-cloud-credential-operator.
All builds following this will include this PR.