Closed jstuever closed 2 months ago
/jira refresh
@jstuever: This pull request references Jira Issue OCPBUGS-37782, which is valid.
Requesting review from QA contact: /cc @jianping-shu
/jira backport release-4.17
@jstuever: The following backport issues have been created:
Queuing cherrypicks to the requested branches to be created after this PR merges: /cherrypick release-4.17
@openshift-ci-robot: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.
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-sigs/prow repository.
/jira backport release-4.16,release-4.15,release-4.14
@jstuever: Missing required branches for backport chain:
/jira backport release-4.17,release-4.16,release-4.15,release-4.14
@jstuever: The following backport issues have been created:
Queuing cherrypicks to the requested branches to be created after this PR merges: /cherrypick release-4.17 /cherrypick release-4.16 /cherrypick release-4.15 /cherrypick release-4.14
@openshift-ci-robot: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.
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-sigs/prow repository.
@jstuever: all tests passed!
Full PR test history. Your PR dashboard.
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 47.28%. Comparing base (
2c25ae6
) to head (9a33c3a
).
/jira refresh
@jianping-shu: This pull request references Jira Issue OCPBUGS-37782, which is valid.
Requesting review from QA contact: /cc @huangmingxia
/assign @dlom
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: dlom, jstuever
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@jstuever: Jira Issue OCPBUGS-37782: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-37782 has been moved to the MODIFIED state.
@openshift-ci-robot: new pull request created: #747
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-sigs/prow repository.
@openshift-ci-robot: #746 failed to apply on top of branch "release-4.16":
Applying: update google.golang.org/grpc v1.65.0
Using index info to reconstruct a base tree...
M go.mod
M go.sum
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/types/gofeaturespb/go_features.proto
Removing vendor/google.golang.org/grpc/vet.sh
Removing vendor/google.golang.org/grpc/internal/grpcrand/grpcrand_go1.21.go
Removing vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go
Removing vendor/google.golang.org/grpc/internal/channelz/util_nonlinux.go
Removing vendor/google.golang.org/grpc/internal/channelz/util_linux.go
Removing vendor/google.golang.org/grpc/internal/channelz/types.go
Removing vendor/google.golang.org/grpc/internal/channelz/id.go
Removing vendor/google.golang.org/grpc/codegen.sh
Removing vendor/google.golang.org/appengine/urlfetch/urlfetch.go
Removing vendor/google.golang.org/appengine/timeout.go
Removing vendor/google.golang.org/appengine/namespace.go
Removing vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.proto
Removing vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.pb.go
Removing vendor/google.golang.org/appengine/internal/transaction.go
Removing vendor/google.golang.org/appengine/internal/remote_api/remote_api.proto
Removing vendor/google.golang.org/appengine/internal/remote_api/remote_api.pb.go
Removing vendor/google.golang.org/appengine/internal/regen.sh
Removing vendor/google.golang.org/appengine/internal/net.go
Removing vendor/google.golang.org/appengine/internal/modules/modules_service.proto
Removing vendor/google.golang.org/appengine/internal/modules/modules_service.pb.go
Removing vendor/google.golang.org/appengine/internal/metadata.go
Removing vendor/google.golang.org/appengine/internal/main_vm.go
Removing vendor/google.golang.org/appengine/internal/main_common.go
Removing vendor/google.golang.org/appengine/internal/main.go
Removing vendor/google.golang.org/appengine/internal/log/log_service.proto
Removing vendor/google.golang.org/appengine/internal/log/log_service.pb.go
Removing vendor/google.golang.org/appengine/internal/internal.go
Removing vendor/google.golang.org/appengine/internal/identity_vm.go
Removing vendor/google.golang.org/appengine/internal/identity_flex.go
Removing vendor/google.golang.org/appengine/internal/identity_classic.go
Removing vendor/google.golang.org/appengine/internal/identity.go
Removing vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto
Removing vendor/google.golang.org/appengine/internal/datastore/datastore_v3.pb.go
Removing vendor/google.golang.org/appengine/internal/base/api_base.proto
Removing vendor/google.golang.org/appengine/internal/base/api_base.pb.go
Removing vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.proto
Removing vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.pb.go
Removing vendor/google.golang.org/appengine/internal/app_id.go
Removing vendor/google.golang.org/appengine/internal/api_common.go
Removing vendor/google.golang.org/appengine/internal/api_classic.go
Removing vendor/google.golang.org/appengine/internal/api.go
Removing vendor/google.golang.org/appengine/identity.go
Removing vendor/google.golang.org/appengine/errors.go
Removing vendor/google.golang.org/appengine/appengine_vm.go
Removing vendor/google.golang.org/appengine/appengine.go
Removing vendor/google.golang.org/appengine/README.md
Removing vendor/google.golang.org/appengine/LICENSE
Removing vendor/google.golang.org/appengine/CONTRIBUTING.md
Removing vendor/golang.org/x/oauth2/internal/client_appengine.go
Removing vendor/golang.org/x/oauth2/google/appengine_gen2_flex.go
Removing vendor/golang.org/x/oauth2/google/appengine_gen1.go
Removing vendor/cloud.google.com/go/compute/metadata/tidyfix.go
Removing vendor/cloud.google.com/go/compute/internal/version.go
Removing vendor/cloud.google.com/go/compute/LICENSE
Auto-merging 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 google.golang.org/grpc v1.65.0
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".
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-sigs/prow repository.
@openshift-ci-robot: #746 failed to apply on top of branch "release-4.15":
Applying: update google.golang.org/grpc v1.65.0
Using index info to reconstruct a base tree...
M go.mod
M go.sum
A vendor/cloud.google.com/go/compute/LICENSE
A vendor/cloud.google.com/go/compute/internal/version.go
M vendor/cloud.google.com/go/compute/metadata/CHANGES.md
M vendor/cloud.google.com/go/compute/metadata/metadata.go
M vendor/cloud.google.com/go/compute/metadata/retry.go
A vendor/cloud.google.com/go/compute/metadata/tidyfix.go
M vendor/golang.org/x/oauth2/google/appengine.go
A vendor/golang.org/x/oauth2/google/appengine_gen1.go
A vendor/golang.org/x/oauth2/google/appengine_gen2_flex.go
M vendor/golang.org/x/oauth2/google/default.go
M vendor/golang.org/x/oauth2/google/externalaccount/aws.go
M vendor/golang.org/x/oauth2/google/externalaccount/basecredentials.go
A vendor/golang.org/x/oauth2/internal/client_appengine.go
M vendor/golang.org/x/oauth2/internal/transport.go
M vendor/golang.org/x/oauth2/oauth2.go
A vendor/google.golang.org/appengine/CONTRIBUTING.md
A vendor/google.golang.org/appengine/LICENSE
A vendor/google.golang.org/appengine/README.md
A vendor/google.golang.org/appengine/appengine.go
A vendor/google.golang.org/appengine/appengine_vm.go
A vendor/google.golang.org/appengine/errors.go
A vendor/google.golang.org/appengine/identity.go
A vendor/google.golang.org/appengine/internal/api.go
A vendor/google.golang.org/appengine/internal/api_classic.go
A vendor/google.golang.org/appengine/internal/api_common.go
A vendor/google.golang.org/appengine/internal/app_id.go
A vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.pb.go
A vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.proto
A vendor/google.golang.org/appengine/internal/base/api_base.pb.go
A vendor/google.golang.org/appengine/internal/base/api_base.proto
A vendor/google.golang.org/appengine/internal/datastore/datastore_v3.pb.go
A vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto
A vendor/google.golang.org/appengine/internal/identity.go
A vendor/google.golang.org/appengine/internal/identity_classic.go
A vendor/google.golang.org/appengine/internal/identity_flex.go
A vendor/google.golang.org/appengine/internal/identity_vm.go
A vendor/google.golang.org/appengine/internal/internal.go
A vendor/google.golang.org/appengine/internal/log/log_service.pb.go
A vendor/google.golang.org/appengine/internal/log/log_service.proto
A vendor/google.golang.org/appengine/internal/main.go
A vendor/google.golang.org/appengine/internal/main_common.go
A vendor/google.golang.org/appengine/internal/main_vm.go
A vendor/google.golang.org/appengine/internal/metadata.go
A vendor/google.golang.org/appengine/internal/modules/modules_service.pb.go
A vendor/google.golang.org/appengine/internal/modules/modules_service.proto
A vendor/google.golang.org/appengine/internal/net.go
A vendor/google.golang.org/appengine/internal/regen.sh
A vendor/google.golang.org/appengine/internal/remote_api/remote_api.pb.go
A vendor/google.golang.org/appengine/internal/remote_api/remote_api.proto
A vendor/google.golang.org/appengine/internal/transaction.go
A vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.pb.go
A vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.proto
A vendor/google.golang.org/appengine/namespace.go
A vendor/google.golang.org/appengine/timeout.go
A vendor/google.golang.org/appengine/urlfetch/urlfetch.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/field_info.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/routing.pb.go
M vendor/google.golang.org/genproto/googleapis/api/launch_stage.pb.go
M vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go
M vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go
M vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go
M vendor/google.golang.org/grpc/CONTRIBUTING.md
M vendor/google.golang.org/grpc/MAINTAINERS.md
M vendor/google.golang.org/grpc/Makefile
M vendor/google.golang.org/grpc/balancer/balancer.go
M vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
M vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer_grpc.pb.go
M vendor/google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go
M vendor/google.golang.org/grpc/balancer_wrapper.go
M vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
M vendor/google.golang.org/grpc/clientconn.go
A vendor/google.golang.org/grpc/codegen.sh
M vendor/google.golang.org/grpc/codes/codes.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
M vendor/google.golang.org/grpc/credentials/credentials.go
M vendor/google.golang.org/grpc/credentials/google/xds.go
M vendor/google.golang.org/grpc/dialoptions.go
M vendor/google.golang.org/grpc/internal/balancer/gracefulswitch/gracefulswitch.go
M vendor/google.golang.org/grpc/internal/binarylog/method_logger.go
M vendor/google.golang.org/grpc/internal/channelz/funcs.go
A vendor/google.golang.org/grpc/internal/channelz/id.go
M vendor/google.golang.org/grpc/internal/channelz/logging.go
A vendor/google.golang.org/grpc/internal/channelz/types.go
A vendor/google.golang.org/grpc/internal/channelz/types_linux.go
A vendor/google.golang.org/grpc/internal/channelz/types_nonlinux.go
A vendor/google.golang.org/grpc/internal/channelz/util_linux.go
A vendor/google.golang.org/grpc/internal/channelz/util_nonlinux.go
M vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
M vendor/google.golang.org/grpc/internal/grpcutil/compressor.go
M vendor/google.golang.org/grpc/internal/internal.go
M vendor/google.golang.org/grpc/internal/pretty/pretty.go
M vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
M vendor/google.golang.org/grpc/internal/resolver/dns/internal/internal.go
M vendor/google.golang.org/grpc/internal/transport/controlbuf.go
M vendor/google.golang.org/grpc/internal/transport/handler_server.go
M vendor/google.golang.org/grpc/internal/transport/http2_client.go
M vendor/google.golang.org/grpc/internal/transport/http2_server.go
M vendor/google.golang.org/grpc/internal/transport/http_util.go
M vendor/google.golang.org/grpc/internal/transport/transport.go
A vendor/google.golang.org/grpc/internal/xds_handshake_cluster.go
M vendor/google.golang.org/grpc/peer/peer.go
M vendor/google.golang.org/grpc/picker_wrapper.go
M vendor/google.golang.org/grpc/pickfirst.go
M vendor/google.golang.org/grpc/regenerate.sh
M vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
M vendor/google.golang.org/grpc/resolver/resolver.go
M vendor/google.golang.org/grpc/resolver_wrapper.go
M vendor/google.golang.org/grpc/rpc_util.go
M vendor/google.golang.org/grpc/server.go
M vendor/google.golang.org/grpc/service_config.go
M vendor/google.golang.org/grpc/stats/stats.go
M vendor/google.golang.org/grpc/stream.go
M vendor/google.golang.org/grpc/version.go
A vendor/google.golang.org/grpc/vet.sh
M vendor/google.golang.org/protobuf/encoding/protojson/encode.go
M vendor/google.golang.org/protobuf/encoding/prototext/encode.go
M vendor/google.golang.org/protobuf/internal/descfmt/stringer.go
M vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb
M vendor/google.golang.org/protobuf/internal/encoding/tag/tag.go
M vendor/google.golang.org/protobuf/internal/errors/errors.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc_init.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc_list_gen.go
M vendor/google.golang.org/protobuf/internal/filedesc/editions.go
M vendor/google.golang.org/protobuf/internal/filedesc/placeholder.go
M vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
M vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go
M vendor/google.golang.org/protobuf/internal/impl/codec_field.go
M vendor/google.golang.org/protobuf/internal/impl/codec_map.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_enum.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_extension.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_file.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
M vendor/google.golang.org/protobuf/internal/impl/message_reflect.go
M vendor/google.golang.org/protobuf/internal/impl/message_reflect_gen.go
M vendor/google.golang.org/protobuf/internal/version/version.go
M vendor/google.golang.org/protobuf/proto/decode.go
M vendor/google.golang.org/protobuf/proto/encode.go
M vendor/google.golang.org/protobuf/proto/extension.go
M vendor/google.golang.org/protobuf/proto/messageset.go
M vendor/google.golang.org/protobuf/proto/size.go
M vendor/google.golang.org/protobuf/reflect/protodesc/desc.go
M vendor/google.golang.org/protobuf/reflect/protodesc/desc_init.go
M vendor/google.golang.org/protobuf/reflect/protodesc/desc_validate.go
M vendor/google.golang.org/protobuf/reflect/protodesc/editions.go
M vendor/google.golang.org/protobuf/reflect/protodesc/proto.go
M vendor/google.golang.org/protobuf/reflect/protoreflect/proto.go
M vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
M vendor/google.golang.org/protobuf/reflect/protoreflect/type.go
M vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
M vendor/google.golang.org/protobuf/types/gofeaturespb/go_features.pb.go
A vendor/google.golang.org/protobuf/types/gofeaturespb/go_features.proto
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/google.golang.org/protobuf/types/gofeaturespb/go_features.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/types/gofeaturespb/go_features.pb.go
Auto-merging vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
Auto-merging vendor/google.golang.org/protobuf/reflect/protoreflect/type.go
Auto-merging vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
Auto-merging vendor/google.golang.org/protobuf/reflect/protodesc/desc_validate.go
Auto-merging vendor/google.golang.org/protobuf/proto/extension.go
Auto-merging vendor/google.golang.org/protobuf/internal/version/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/internal/version/version.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/message_reflect_gen.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/message_reflect.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/legacy_enum.go
Auto-merging vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
Auto-merging vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go
Auto-merging vendor/google.golang.org/protobuf/internal/filedesc/desc_init.go
Auto-merging vendor/google.golang.org/protobuf/internal/filedesc/desc.go
Auto-merging vendor/google.golang.org/protobuf/internal/errors/errors.go
Auto-merging vendor/google.golang.org/grpc/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/version.go
Auto-merging vendor/google.golang.org/grpc/stream.go
Auto-merging vendor/google.golang.org/grpc/service_config.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/service_config.go
Auto-merging vendor/google.golang.org/grpc/resolver_wrapper.go
Auto-merging vendor/google.golang.org/grpc/picker_wrapper.go
Auto-merging vendor/google.golang.org/grpc/internal/xds/xds.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_server.go
Auto-merging vendor/google.golang.org/grpc/internal/resolver/dns/internal/internal.go
Auto-merging vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
Auto-merging vendor/google.golang.org/grpc/internal/internal.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/internal.go
CONFLICT (rename/delete): vendor/google.golang.org/grpc/internal/channelz/util_linux.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/google.golang.org/grpc/internal/grpcsync/oncefunc.go in HEAD. Version HEAD of vendor/google.golang.org/grpc/internal/grpcsync/oncefunc.go left in tree.
Removing vendor/google.golang.org/grpc/internal/grpcrand/grpcrand_go1.21.go
Removing vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go
CONFLICT (rename/delete): vendor/google.golang.org/grpc/internal/channelz/util_nonlinux.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/google.golang.org/grpc/internal/googlecloud/manufacturer.go in HEAD. Version HEAD of vendor/google.golang.org/grpc/internal/googlecloud/manufacturer.go left in tree.
Auto-merging vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/syscall_nonlinux.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/syscall_linux.go
Auto-merging vendor/google.golang.org/grpc/dialoptions.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/dialoptions.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
Auto-merging vendor/google.golang.org/grpc/clientconn.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/clientconn.go
Auto-merging vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
Auto-merging vendor/google.golang.org/grpc/balancer_wrapper.go
Auto-merging vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
Auto-merging vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer_grpc.pb.go
Auto-merging vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
CONFLICT (rename/delete): vendor/golang.org/x/oauth2/internal/client_appengine.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/golang.org/x/sys/cpu/cpu_mipsx.go in HEAD. Version HEAD of vendor/golang.org/x/sys/cpu/cpu_mipsx.go left in tree.
CONFLICT (rename/delete): vendor/cloud.google.com/go/compute/internal/version.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/iam/internal/version.go in HEAD. Version HEAD of vendor/cloud.google.com/go/iam/internal/version.go left in tree.
CONFLICT (rename/delete): vendor/cloud.google.com/go/compute/metadata/tidyfix.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/iam/admin/apiv1/version.go in HEAD. Version HEAD of vendor/cloud.google.com/go/iam/admin/apiv1/version.go left in tree.
CONFLICT (rename/delete): vendor/google.golang.org/appengine/LICENSE deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/auth/LICENSE in HEAD. Version HEAD of vendor/cloud.google.com/go/auth/LICENSE left in tree.
CONFLICT (rename/delete): vendor/cloud.google.com/go/compute/LICENSE deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/LICENSE in HEAD. Version HEAD of vendor/cloud.google.com/go/LICENSE left in tree.
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 google.golang.org/grpc v1.65.0
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".
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-sigs/prow repository.
@openshift-ci-robot: #746 failed to apply on top of branch "release-4.14":
Applying: update google.golang.org/grpc v1.65.0
Using index info to reconstruct a base tree...
M go.mod
M go.sum
A vendor/cloud.google.com/go/compute/LICENSE
A vendor/cloud.google.com/go/compute/internal/version.go
M vendor/cloud.google.com/go/compute/metadata/CHANGES.md
M vendor/cloud.google.com/go/compute/metadata/metadata.go
M vendor/cloud.google.com/go/compute/metadata/retry.go
A vendor/cloud.google.com/go/compute/metadata/tidyfix.go
M vendor/golang.org/x/oauth2/google/appengine.go
A vendor/golang.org/x/oauth2/google/appengine_gen1.go
A vendor/golang.org/x/oauth2/google/appengine_gen2_flex.go
M vendor/golang.org/x/oauth2/google/default.go
M vendor/golang.org/x/oauth2/google/externalaccount/aws.go
M vendor/golang.org/x/oauth2/google/externalaccount/basecredentials.go
A vendor/golang.org/x/oauth2/internal/client_appengine.go
M vendor/golang.org/x/oauth2/internal/transport.go
M vendor/golang.org/x/oauth2/oauth2.go
A vendor/google.golang.org/appengine/CONTRIBUTING.md
A vendor/google.golang.org/appengine/LICENSE
A vendor/google.golang.org/appengine/README.md
A vendor/google.golang.org/appengine/appengine.go
A vendor/google.golang.org/appengine/appengine_vm.go
A vendor/google.golang.org/appengine/errors.go
A vendor/google.golang.org/appengine/identity.go
A vendor/google.golang.org/appengine/internal/api.go
A vendor/google.golang.org/appengine/internal/api_classic.go
A vendor/google.golang.org/appengine/internal/api_common.go
A vendor/google.golang.org/appengine/internal/app_id.go
A vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.pb.go
A vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.proto
A vendor/google.golang.org/appengine/internal/base/api_base.pb.go
A vendor/google.golang.org/appengine/internal/base/api_base.proto
A vendor/google.golang.org/appengine/internal/datastore/datastore_v3.pb.go
A vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto
A vendor/google.golang.org/appengine/internal/identity.go
A vendor/google.golang.org/appengine/internal/identity_classic.go
A vendor/google.golang.org/appengine/internal/identity_flex.go
A vendor/google.golang.org/appengine/internal/identity_vm.go
A vendor/google.golang.org/appengine/internal/internal.go
A vendor/google.golang.org/appengine/internal/log/log_service.pb.go
A vendor/google.golang.org/appengine/internal/log/log_service.proto
A vendor/google.golang.org/appengine/internal/main.go
A vendor/google.golang.org/appengine/internal/main_common.go
A vendor/google.golang.org/appengine/internal/main_vm.go
A vendor/google.golang.org/appengine/internal/metadata.go
A vendor/google.golang.org/appengine/internal/modules/modules_service.pb.go
A vendor/google.golang.org/appengine/internal/modules/modules_service.proto
A vendor/google.golang.org/appengine/internal/net.go
A vendor/google.golang.org/appengine/internal/regen.sh
A vendor/google.golang.org/appengine/internal/remote_api/remote_api.pb.go
A vendor/google.golang.org/appengine/internal/remote_api/remote_api.proto
A vendor/google.golang.org/appengine/internal/transaction.go
A vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.pb.go
A vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.proto
A vendor/google.golang.org/appengine/namespace.go
A vendor/google.golang.org/appengine/timeout.go
A vendor/google.golang.org/appengine/urlfetch/urlfetch.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/field_info.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go
M vendor/google.golang.org/genproto/googleapis/api/annotations/routing.pb.go
M vendor/google.golang.org/genproto/googleapis/api/launch_stage.pb.go
M vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go
M vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go
M vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go
M vendor/google.golang.org/grpc/CONTRIBUTING.md
M vendor/google.golang.org/grpc/MAINTAINERS.md
M vendor/google.golang.org/grpc/Makefile
M vendor/google.golang.org/grpc/balancer/balancer.go
M vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
M vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer_grpc.pb.go
M vendor/google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go
M vendor/google.golang.org/grpc/balancer_wrapper.go
M vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
M vendor/google.golang.org/grpc/clientconn.go
A vendor/google.golang.org/grpc/codegen.sh
M vendor/google.golang.org/grpc/codes/codes.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go
M vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
M vendor/google.golang.org/grpc/credentials/credentials.go
M vendor/google.golang.org/grpc/credentials/google/xds.go
M vendor/google.golang.org/grpc/dialoptions.go
M vendor/google.golang.org/grpc/internal/balancer/gracefulswitch/gracefulswitch.go
M vendor/google.golang.org/grpc/internal/binarylog/method_logger.go
M vendor/google.golang.org/grpc/internal/channelz/funcs.go
A vendor/google.golang.org/grpc/internal/channelz/id.go
M vendor/google.golang.org/grpc/internal/channelz/logging.go
A vendor/google.golang.org/grpc/internal/channelz/types.go
A vendor/google.golang.org/grpc/internal/channelz/types_linux.go
A vendor/google.golang.org/grpc/internal/channelz/types_nonlinux.go
A vendor/google.golang.org/grpc/internal/channelz/util_linux.go
A vendor/google.golang.org/grpc/internal/channelz/util_nonlinux.go
M vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
M vendor/google.golang.org/grpc/internal/grpcutil/compressor.go
M vendor/google.golang.org/grpc/internal/internal.go
M vendor/google.golang.org/grpc/internal/pretty/pretty.go
M vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
M vendor/google.golang.org/grpc/internal/resolver/dns/internal/internal.go
M vendor/google.golang.org/grpc/internal/transport/controlbuf.go
M vendor/google.golang.org/grpc/internal/transport/handler_server.go
M vendor/google.golang.org/grpc/internal/transport/http2_client.go
M vendor/google.golang.org/grpc/internal/transport/http2_server.go
M vendor/google.golang.org/grpc/internal/transport/http_util.go
M vendor/google.golang.org/grpc/internal/transport/transport.go
A vendor/google.golang.org/grpc/internal/xds_handshake_cluster.go
M vendor/google.golang.org/grpc/peer/peer.go
M vendor/google.golang.org/grpc/picker_wrapper.go
M vendor/google.golang.org/grpc/pickfirst.go
M vendor/google.golang.org/grpc/regenerate.sh
M vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
M vendor/google.golang.org/grpc/resolver/resolver.go
M vendor/google.golang.org/grpc/resolver_wrapper.go
M vendor/google.golang.org/grpc/rpc_util.go
M vendor/google.golang.org/grpc/server.go
M vendor/google.golang.org/grpc/service_config.go
M vendor/google.golang.org/grpc/stats/stats.go
M vendor/google.golang.org/grpc/stream.go
M vendor/google.golang.org/grpc/version.go
A vendor/google.golang.org/grpc/vet.sh
M vendor/google.golang.org/protobuf/encoding/protojson/encode.go
M vendor/google.golang.org/protobuf/encoding/prototext/encode.go
M vendor/google.golang.org/protobuf/internal/descfmt/stringer.go
M vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb
M vendor/google.golang.org/protobuf/internal/encoding/tag/tag.go
M vendor/google.golang.org/protobuf/internal/errors/errors.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc_init.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go
M vendor/google.golang.org/protobuf/internal/filedesc/desc_list_gen.go
M vendor/google.golang.org/protobuf/internal/filedesc/editions.go
M vendor/google.golang.org/protobuf/internal/filedesc/placeholder.go
M vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
M vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go
M vendor/google.golang.org/protobuf/internal/impl/codec_field.go
M vendor/google.golang.org/protobuf/internal/impl/codec_map.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_enum.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_extension.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_file.go
M vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
M vendor/google.golang.org/protobuf/internal/impl/message_reflect.go
M vendor/google.golang.org/protobuf/internal/impl/message_reflect_gen.go
M vendor/google.golang.org/protobuf/internal/version/version.go
M vendor/google.golang.org/protobuf/proto/decode.go
M vendor/google.golang.org/protobuf/proto/encode.go
M vendor/google.golang.org/protobuf/proto/extension.go
M vendor/google.golang.org/protobuf/proto/messageset.go
M vendor/google.golang.org/protobuf/proto/size.go
M vendor/google.golang.org/protobuf/reflect/protodesc/desc.go
M vendor/google.golang.org/protobuf/reflect/protodesc/desc_init.go
M vendor/google.golang.org/protobuf/reflect/protodesc/desc_validate.go
M vendor/google.golang.org/protobuf/reflect/protodesc/editions.go
M vendor/google.golang.org/protobuf/reflect/protodesc/proto.go
M vendor/google.golang.org/protobuf/reflect/protoreflect/proto.go
M vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
M vendor/google.golang.org/protobuf/reflect/protoreflect/type.go
M vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
M vendor/google.golang.org/protobuf/types/gofeaturespb/go_features.pb.go
A vendor/google.golang.org/protobuf/types/gofeaturespb/go_features.proto
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/google.golang.org/protobuf/types/gofeaturespb/go_features.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/types/gofeaturespb/go_features.pb.go
Auto-merging vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
Auto-merging vendor/google.golang.org/protobuf/reflect/protoreflect/type.go
Auto-merging vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
Auto-merging vendor/google.golang.org/protobuf/reflect/protodesc/desc_validate.go
Auto-merging vendor/google.golang.org/protobuf/proto/extension.go
Auto-merging vendor/google.golang.org/protobuf/internal/version/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/internal/version/version.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/message_reflect_gen.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/message_reflect.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
Auto-merging vendor/google.golang.org/protobuf/internal/impl/legacy_enum.go
Auto-merging vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
Auto-merging vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go
Auto-merging vendor/google.golang.org/protobuf/internal/filedesc/desc_init.go
Auto-merging vendor/google.golang.org/protobuf/internal/filedesc/desc.go
Auto-merging vendor/google.golang.org/protobuf/internal/errors/errors.go
Auto-merging vendor/google.golang.org/grpc/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/version.go
Auto-merging vendor/google.golang.org/grpc/stream.go
Auto-merging vendor/google.golang.org/grpc/service_config.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/service_config.go
Auto-merging vendor/google.golang.org/grpc/resolver_wrapper.go
Auto-merging vendor/google.golang.org/grpc/picker_wrapper.go
Auto-merging vendor/google.golang.org/grpc/internal/xds/xds.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_server.go
Auto-merging vendor/google.golang.org/grpc/internal/resolver/dns/internal/internal.go
Auto-merging vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
Auto-merging vendor/google.golang.org/grpc/internal/internal.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/internal.go
CONFLICT (rename/delete): vendor/google.golang.org/grpc/internal/channelz/util_linux.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/google.golang.org/grpc/internal/grpcsync/oncefunc.go in HEAD. Version HEAD of vendor/google.golang.org/grpc/internal/grpcsync/oncefunc.go left in tree.
Removing vendor/google.golang.org/grpc/internal/grpcrand/grpcrand_go1.21.go
Removing vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go
CONFLICT (rename/delete): vendor/google.golang.org/grpc/internal/channelz/util_nonlinux.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/google.golang.org/grpc/internal/googlecloud/manufacturer.go in HEAD. Version HEAD of vendor/google.golang.org/grpc/internal/googlecloud/manufacturer.go left in tree.
Auto-merging vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/syscall_nonlinux.go
Auto-merging vendor/google.golang.org/grpc/internal/channelz/syscall_linux.go
Auto-merging vendor/google.golang.org/grpc/dialoptions.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/dialoptions.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker_grpc.pb.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go
Auto-merging vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go
Auto-merging vendor/google.golang.org/grpc/clientconn.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/clientconn.go
Auto-merging vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
Auto-merging vendor/google.golang.org/grpc/balancer_wrapper.go
Auto-merging vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
Auto-merging vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer_grpc.pb.go
Auto-merging vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
CONFLICT (rename/delete): vendor/golang.org/x/oauth2/internal/client_appengine.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/golang.org/x/sys/cpu/cpu_mipsx.go in HEAD. Version HEAD of vendor/golang.org/x/sys/cpu/cpu_mipsx.go left in tree.
CONFLICT (rename/delete): vendor/cloud.google.com/go/compute/internal/version.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/iam/internal/version.go in HEAD. Version HEAD of vendor/cloud.google.com/go/iam/internal/version.go left in tree.
CONFLICT (rename/delete): vendor/cloud.google.com/go/compute/metadata/tidyfix.go deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/iam/admin/apiv1/version.go in HEAD. Version HEAD of vendor/cloud.google.com/go/iam/admin/apiv1/version.go left in tree.
CONFLICT (rename/delete): vendor/google.golang.org/appengine/LICENSE deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/auth/LICENSE in HEAD. Version HEAD of vendor/cloud.google.com/go/auth/LICENSE left in tree.
CONFLICT (rename/delete): vendor/cloud.google.com/go/compute/LICENSE deleted in update google.golang.org/grpc v1.65.0 and renamed to vendor/cloud.google.com/go/LICENSE in HEAD. Version HEAD of vendor/cloud.google.com/go/LICENSE left in tree.
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 google.golang.org/grpc v1.65.0
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".
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-sigs/prow repository.
[ART PR BUILD NOTIFIER]
Distgit: ose-cloud-credential-operator This PR has been included in build ose-cloud-credential-operator-container-v4.18.0-202408140944.p0.g26d835e.assembly.stream.el9. All builds following this will include this PR.
@jstuever: This pull request references Jira Issue OCPBUGS-37782, 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.18.0) matches configured target version for branch (4.18.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.