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

add doc for new flag experimental-keystone-ca-file #1620

Merged
merged 1 commit into from
Nov 28, 2016

Conversation

dixudx
Copy link
Member

@dixudx dixudx commented Nov 4, 2016

add doc for this new flag.


This change is Reviewable

@erictune
Copy link
Member

Since this was sent, the 1.5 branch has been cut. So, this needs to be cherry picked to release-1.5 as well.

@dixudx dixudx changed the base branch from master to release-1.5 November 17, 2016 02:40
@@ -367,6 +367,12 @@ option to the API server during startup. The plugin is implemented in
`plugin/pkg/auth/authenticator/password/keystone/keystone.go` and currently uses
basic auth to verify used by username and password.

If you have configured self-signed certificates for Keystone server,
`--experimental-keystone-ca-file=SOMEFIlE` option may be needed during the startup
Copy link
Contributor

Choose a reason for hiding this comment

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

"If you have configured self-signed certificates for the Keystone server, you may need to set the --experimental-keystone-ca-file=SOMEFILEoption when starting the Kubernetes API server. If you set the option, the Keystone server's certificate is verified by one of the authorities in theexperimental-keystone-ca-file`. Otherwise, the certificate is verified by the host's root Certificate Authority."

@devin-donnelly
Copy link
Contributor

Some feedback on wording, for clarity and avoiding run-on sentences.

@dixudx
Copy link
Member Author

dixudx commented Nov 23, 2016

@devin-donnelly I've already fixed that. Thanks for your review.

@devin-donnelly devin-donnelly merged commit c180ba1 into kubernetes:release-1.5 Nov 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants