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 #29860 #30149

Merged
merged 1 commit into from
Aug 5, 2016
Merged

Automated cherry pick of #29860 #30149

merged 1 commit into from
Aug 5, 2016

Conversation

erictune
Copy link
Member

@erictune erictune commented Aug 5, 2016

Cherry pick of #29860 on release-1.3.

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@erictune erictune mentioned this pull request Aug 5, 2016
Closed
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 5, 2016
@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)

@ericchiang
Copy link
Contributor

@googlebot I'm okay with these commits being contributed to Google.

@liggitt
Copy link
Member

liggitt commented Aug 5, 2016

LGTM

@liggitt liggitt 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 do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Aug 5, 2016
@liggitt liggitt added this to the v1.3 milestone Aug 5, 2016
@liggitt liggitt added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2016
@erictune
Copy link
Member Author

erictune commented Aug 5, 2016

@liggitt needs to say he is okay.

@liggitt liggitt added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Aug 5, 2016
@liggitt
Copy link
Member

liggitt commented Aug 5, 2016

some days the bot works for you, some days you work for the bot

@liggitt
Copy link
Member

liggitt commented Aug 5, 2016

@liggitt needs to say he is okay

Not sure why, if I'm not on the commit as a committer or author, but if it makes the bot happy, @googlebot I'm okay with these commits being contributed to Google

@erictune
Copy link
Member Author

erictune commented Aug 5, 2016

Weird. I was sure I saw your face next to the commit when I looked at it, but it sure isn't you now.

@erictune
oidc authentication plugin: don't trim issuer URLs with trailing slashes
a22d715 
The issuer URL passed to the plugin must identically match the issuer
URL returned by OpenID Connect discovery. However, the plugin currently
trims all trailing slashes from issuer URLs, causing a mismatch. Since
the go-oidc client already handles this case correctly, don't trim the
path.
@erictune erictune force-pushed the automated-cherry-pick-of-#29860-upstream-release-1.3 branch from cbfa94a to a22d715 Compare August 5, 2016 18:16
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2016
@liggitt liggitt added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2016
@k8s-bot
Copy link

k8s-bot commented Aug 5, 2016

GCE e2e build/test passed for commit a22d715.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Aug 5, 2016

GCE e2e build/test passed for commit a22d715.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 0fb5902 into kubernetes:release-1.3 Aug 5, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#30149 from erictune/automated-cherry-pi…
ec1b4e4 
…ck-of-#29860-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#29860

Cherry pick of kubernetes#29860 on release-1.3.
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
Merge pull request kubernetes#30149 from erictune/automated-cherry-pi…
c465ed5 
…ck-of-#29860-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#29860

Cherry pick of kubernetes#29860 on release-1.3.
@erictune erictune deleted the automated-cherry-pick-of-#29860-upstream-release-1.3 branch August 8, 2017 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@liggitt liggitt

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
6 participants
@erictune @googlebot @k8s-github-robot @ericchiang @liggitt @k8s-bot