Skip to content

Automated cherry pick of #1092: Separate user errors from internal errors #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

sunnylovestiramisu
Copy link
Contributor

@sunnylovestiramisu sunnylovestiramisu commented May 10, 2023

Cherry pick of #1092 on release-1.7.

#1092: Separate user errors from internal errors

For details on the cherry pick process, see the cherry pick requests page.

Separate user errors from internal errors

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 10, 2023
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 10, 2023
@sunnylovestiramisu sunnylovestiramisu force-pushed the automated-cherry-pick-of-#1092-upstream-release-1.7 branch 2 times, most recently from 27c7fc9 to 5c3e8be Compare May 10, 2023 16:44
@sunnylovestiramisu sunnylovestiramisu force-pushed the automated-cherry-pick-of-#1092-upstream-release-1.7 branch from 5c3e8be to 7f52192 Compare May 10, 2023 16:50
@sunnylovestiramisu
Copy link
Contributor Author

/retest

Since test/run-unit.sh succeeded locally

@sunnylovestiramisu
Copy link
Contributor Author

/assign @msau42

@msau42
Copy link
Contributor

msau42 commented May 10, 2023

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msau42, sunnylovestiramisu

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 10, 2023
@k8s-ci-robot k8s-ci-robot merged commit e7bbf8f into kubernetes-sigs:release-1.7 May 10, 2023
@judemars
Copy link
Contributor

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@judemars: #1219 failed to apply on top of branch "release-1.10":

Applying: Separate user errors from internal errors
Using index info to reconstruct a base tree...
M	cmd/gce-pd-csi-driver/main.go
M	pkg/gce-cloud-provider/compute/fake-gce.go
M	pkg/gce-cloud-provider/compute/gce-compute.go
M	pkg/gce-cloud-provider/compute/gce.go
M	pkg/gce-cloud-provider/metadata/metadata.go
M	pkg/gce-pd-csi-driver/controller.go
M	pkg/gce-pd-csi-driver/node.go
M	pkg/gce-pd-csi-driver/server.go
M	pkg/gce-pd-csi-driver/utils.go
M	pkg/gce-pd-csi-driver/utils_linux.go
M	pkg/gce-pd-csi-driver/utils_windows.go
M	pkg/metrics/metrics.go
A	pkg/mount-manager/device-utils.go
M	pkg/mount-manager/safe-mounter_windows.go
M	pkg/mount-manager/statter_linux.go
M	test/k8s-integration/cluster.go
M	test/remote/ssh.go
M	test/sanity/sanity_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/sanity/sanity_test.go
Auto-merging test/remote/ssh.go
Auto-merging test/k8s-integration/cluster.go
Auto-merging pkg/mount-manager/safe-mounter_windows.go
Auto-merging pkg/metrics/metrics.go
Auto-merging pkg/gce-pd-csi-driver/utils_windows.go
Auto-merging pkg/gce-pd-csi-driver/utils.go
Auto-merging pkg/gce-pd-csi-driver/node.go
CONFLICT (content): Merge conflict in pkg/gce-pd-csi-driver/node.go
Auto-merging pkg/gce-pd-csi-driver/controller.go
CONFLICT (content): Merge conflict in pkg/gce-pd-csi-driver/controller.go
Auto-merging pkg/gce-cloud-provider/compute/gce.go
Auto-merging pkg/gce-cloud-provider/compute/gce-compute.go
Auto-merging pkg/gce-cloud-provider/compute/fake-gce.go
Auto-merging pkg/deviceutils/device-utils.go
CONFLICT (content): Merge conflict in pkg/deviceutils/device-utils.go
Auto-merging cmd/gce-pd-csi-driver/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Separate user errors from internal errors
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-1.10

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.

@sunnylovestiramisu sunnylovestiramisu deleted the automated-cherry-pick-of-#1092-upstream-release-1.7 branch March 15, 2024 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants