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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #43493 #43776

Merged
merged 1 commit into from
Mar 31, 2017
Merged

Automated cherry pick of #43493 #43776

merged 1 commit into from
Mar 31, 2017

Conversation

pipejakob
Copy link
Contributor

Cherry pick of #43493 on release-1.6.

#43493: Better messaging when GKE certificate signing fails.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 28, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 28, 2017
@k8s-github-robot
Copy link

The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks)

@pipejakob
Copy link
Contributor Author

/assign enisoc

@pipejakob
Copy link
Contributor Author

/release-note Better messaging when GKE certificate signing fails.

@pipejakob
Copy link
Contributor Author

/assign @enisoc

@pipejakob
Copy link
Contributor Author

/unassign @roberthbailey

@pipejakob
Copy link
Contributor Author

/release-note

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Mar 28, 2017
@pipejakob pipejakob force-pushed the automated-cherry-pick-of-#43493-upstream-release-1.6 branch from e525447 to 55e71fe Compare March 28, 2017 22:48
@k8s-github-robot k8s-github-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2017
@pipejakob
Copy link
Contributor Author

Ran ./hack/update-openapi-spec.sh to appease the verify step.

roberthbailey
roberthbailey reviewed Mar 29, 2017
View reviewed changes
api/openapi-spec/swagger.json Outdated
@@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"title": "Kubernetes",
"version": "v1.6.0"
"version": "v1.6.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

why is this part of your PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The Jenkins verification on this PR failed due to hack/verify-federation-openapi-spec.sh, so I ran ./hack/update-openapi-spec.sh and amended the commit. I'm not sure if the verify failure would have sorted itself out without any intervention, but I can pull that change back out so it's purely a cherry-pick of the master commit.

This is my first cherry-pick, so apologies if I've bungled the process.

@pipejakob
Better messaging when GKE certificate signing fails.
bf41fe0 
On errors, the GKE signing API can respond with a JSON body that
contains an error message explaining the failure. If we're able to
extract it, use that message when reporting the error instead of the
generic error returned by the webhook library. Also, always add an event
to the CSR object on signing errors.
@pipejakob pipejakob force-pushed the automated-cherry-pick-of-#43493-upstream-release-1.6 branch from 55e71fe to bf41fe0 Compare March 29, 2017 16:47
@pipejakob
Copy link
Contributor Author

I have reverted the swagger.json change, so this diff is back to purely cherry picking the parent PR.

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 29, 2017
@enisoc enisoc added release-note-none Denotes a PR that doesn't merit a release note. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 29, 2017
@enisoc
Copy link
Member

enisoc commented Mar 29, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 29, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enisoc, pipejakob

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@pipejakob
Copy link
Contributor Author

@k8s-bot gci gce e2e test this

@enisoc enisoc added this to the v1.6 milestone Mar 30, 2017
@mikedanese
Copy link
Member

@k8s-bot verification test this

@pipejakob
Copy link
Contributor Author

@k8s-bot verify test this

@pipejakob
Copy link
Contributor Author

@k8s-bot kops aws e2e test this

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 4e67931 into kubernetes:release-1.6 Mar 31, 2017
mintzhao pushed a commit to mintzhao/kubernetes that referenced this pull request Jun 1, 2017
Merge pull request kubernetes#43776 from pipejakob/automated-cherry-p…
690f671 
…ick-of-#43493-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of kubernetes#43493

Cherry pick of kubernetes#43493 on release-1.6.

kubernetes#43493: Better messaging when GKE certificate signing fails.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberthbailey roberthbailey roberthbailey left review comments

Assignees

@enisoc enisoc

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@pipejakob @k8s-reviewable @k8s-github-robot @enisoc @mikedanese @roberthbailey @k8s-ci-robot