search

open-cluster-management-io / addon-framework

addon apis
Apache License 2.0
23 stars 40 forks source link

:bug: update sdk-go to remove annotation when it's nil #261

Closed haoqing0110 closed 5 months ago

haoqing0110 commented 5 months ago

Summary

Related issue(s)

Ref: https://github.com/open-cluster-management-io/sdk-go/pull/29

haoqing0110 commented 5 months ago

/cherrypick release-0.9.0

openshift-cherrypick-robot commented 5 months ago

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

In response to [this](https://github.com/open-cluster-management-io/addon-framework/pull/261#issuecomment-2058166551): >/cherrypick release-0.9.0 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
haoqing0110 commented 5 months ago

/assign @qiujian16

qiujian16 commented 5 months ago

/approve /lgtm

openshift-ci[bot] commented 5 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haoqing0110, qiujian16

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](https://github.com/open-cluster-management-io/addon-framework/blob/main/OWNERS)~~ [qiujian16] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 5 months ago

@haoqing0110: cannot checkout release-0.9.0: error checking out "release-0.9.0": exit status 1 error: pathspec 'release-0.9.0' did not match any file(s) known to git

In response to [this](https://github.com/open-cluster-management-io/addon-framework/pull/261#issuecomment-2058166551): >/cherrypick release-0.9.0 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
haoqing0110 commented 5 months ago

/cherrypick release-0.9

openshift-cherrypick-robot commented 5 months ago

@haoqing0110: #261 failed to apply on top of branch "release-0.9":

Applying: update sdk-go to remove annotation when it's nil
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   vendor/github.com/go-logr/logr/slogr/slogr.go
M   vendor/github.com/golang/protobuf/jsonpb/decode.go
M   vendor/github.com/golang/protobuf/jsonpb/encode.go
M   vendor/github.com/onsi/gomega/CHANGELOG.md
M   vendor/github.com/onsi/gomega/gomega_dsl.go
M   vendor/github.com/onsi/gomega/matchers.go
M   vendor/golang.org/x/oauth2/oauth2.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/syscall_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/grpc/resolver_conn_wrapper.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/oauth2/oauth2.go
Removing vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go
Removing vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go
Auto-merging vendor/github.com/onsi/gomega/matchers.go
Auto-merging vendor/github.com/onsi/gomega/gomega_dsl.go
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/gomega_dsl.go
Auto-merging vendor/github.com/onsi/gomega/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/CHANGELOG.md
Removing vendor/github.com/google/uuid/.travis.yml
Removing vendor/github.com/golang/protobuf/jsonpb/json.go
CONFLICT (modify/delete): vendor/github.com/golang/protobuf/jsonpb/encode.go deleted in update sdk-go to remove annotation when it's nil and modified in HEAD. Version HEAD of vendor/github.com/golang/protobuf/jsonpb/encode.go left in tree.
CONFLICT (modify/delete): vendor/github.com/golang/protobuf/jsonpb/decode.go deleted in update sdk-go to remove annotation when it's nil and modified in HEAD. Version HEAD of vendor/github.com/golang/protobuf/jsonpb/decode.go left in tree.
CONFLICT (modify/delete): vendor/github.com/go-logr/logr/slogr/slogr.go deleted in update sdk-go to remove annotation when it's nil and modified in HEAD. Version HEAD of vendor/github.com/go-logr/logr/slogr/slogr.go 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 sdk-go to remove annotation when it's nil
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](https://github.com/open-cluster-management-io/addon-framework/pull/261#issuecomment-2058332845): >/cherrypick release-0.9 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.