Skip to content
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

Inverted error handling to ensure server-side apply does not fall bac… #78887

Merged
merged 3 commits into from
Jun 18, 2019
Merged

Inverted error handling to ensure server-side apply does not fall bac… #78887

merged 3 commits into from
Jun 18, 2019

Conversation

joshmsamuels
Copy link
Contributor

@joshmsamuels joshmsamuels commented Jun 11, 2019

Inverted error handling to ensure server-side apply does not fall back on client-side apply when there is an error

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind feature

What this PR does / why we need it:
This PR is to prevent server-side apply from falling back on client-side apply when there is an error

Which issue(s) this PR fixes:
Part of issue 73723 is fixed (I dont want the issue to be linked/closed with this PR since it is a small part.

There does not appear to be an issue created just for this

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

…k on client-side apply when there is an error
@k8s-ci-robot
Copy link
Contributor

Welcome @joshmsamuels!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 11, 2019
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


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.

@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: no Indicates the PR's author has not signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 11, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @joshmsamuels. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 11, 2019
@k8s-ci-robot k8s-ci-robot added area/kubectl sig/cli Categorizes an issue or PR as relevant to SIG CLI. release-note-none Denotes a PR that doesn't merit a release note. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. 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 Jun 11, 2019
@joshmsamuels
Copy link
Contributor Author

/assign @brendandburns

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jun 11, 2019
@joshmsamuels
Copy link
Contributor Author

I signed the CLA I am unsure how to re-run the review checks

@joshmsamuels
Copy link
Contributor Author

/retest

@k8s-ci-robot
Copy link
Contributor

@joshmsamuels: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

@yue9944882
Copy link
Member

/cc @jennybuckley

@joshmsamuels
Copy link
Contributor Author

/assign apelisse

if err != nil {
return err
if err != nil {
if isIncompatibleServerError(err) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if we still want to special-case this. We could just fail with the given error (which is probably unsupported media type), or return a completely different error. But I'm not super convinced by the klog.Warning.

Copy link
Member

@apelisse apelisse Jun 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could try this maybe:

if isIncompatibleServerError(err) {
  err = fmt.Errorf("Server-side apply not enabled (%v)", err)
}
return err

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated this. The only change was slight wording of the error message

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome thanks

@apelisse
Copy link
Member

/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 Jun 13, 2019
@apelisse
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 13, 2019
@kwiesmueller
Copy link
Member

/retest

@kwiesmueller
Copy link
Member

/test cla/linuxfoundation

@joshmsamuels
Copy link
Contributor Author

I signed it

@joshmsamuels
Copy link
Contributor Author

/retest

@apelisse
Copy link
Member

You have to fix the extra-spaces that gofmt doesn't like. it's a good idea in general to have gofmt as a pre-save hook in your editor, or as a pre-commit hook.

When you update, we'll see if this fixes the CLA thing. Did you sign with the same address you used to make the commit?

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 14, 2019
@joshmsamuels
Copy link
Contributor Author

@apelisse I updated the code with go fmt

And yes I did. I used the user joshmsamuels to sign the commit and for the cla signature im not sure why its still failing. Is there any other debugging we can do or should I email their support to see if something went wrong

@kwiesmueller
Copy link
Member

/retest

@kwiesmueller
Copy link
Member

@joshmsamuels as it's still not working, I recommend asking for support: https://jira.linuxfoundation.org/servicedesk/customer/portal/4/create/88

@joshmsamuels
Copy link
Contributor Author

I signed it

@joshmsamuels
Copy link
Contributor Author

/retest

@joshmsamuels
Copy link
Contributor Author

@apelisse Can you please add lgtm if youre ok with my last commit

@kwiesmueller
Copy link
Member

/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 Jun 18, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse, joshmsamuels, kwiesmueller

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

@joshmsamuels
Copy link
Contributor Author

joshmsamuels commented Jun 18, 2019 via email

@joshmsamuels
Copy link
Contributor Author

I signed it

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 18, 2019
@joshmsamuels
Copy link
Contributor Author

/retest

1 similar comment
@joshmsamuels
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 12ff2fe into kubernetes:master Jun 18, 2019
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. area/kubectl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. sig/cli Categorizes an issue or PR as relevant to SIG CLI. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants