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

[1.5] Plumb and allow customizing ciphers and tls version #13198

Merged
merged 2 commits into from
Mar 3, 2017
Merged

[1.5] Plumb and allow customizing ciphers and tls version #13198

merged 2 commits into from
Mar 3, 2017

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Mar 2, 2017

Ref: #13167

@liggitt PTAL

@mfojtik mfojtik added this to the 1.5.0 milestone Mar 2, 2017
@liggitt
Copy link
Contributor

liggitt commented Mar 2, 2017

[test]

@liggitt
Copy link
Contributor

liggitt commented Mar 2, 2017

LGTM, [merge]

@mfojtik
Copy link
Contributor Author

mfojtik commented Mar 3, 2017

[test]

@openshift-bot
Copy link
Contributor

openshift-bot commented Mar 3, 2017 •
edited
Loading

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/799/) (Image: devenv-rhel7_6030)

liggitt
liggitt reviewed Mar 3, 2017
View reviewed changes
pkg/cmd/server/kubernetes/master_config.go
@@ -298,6 +299,7 @@ func BuildKubernetesMasterConfig(options configapi.MasterConfig, requestContextM
genericConfig.LegacyAPIGroupPrefixes = LegacyAPIGroupPrefixes
genericConfig.SecureServingInfo.BindAddress = options.ServingInfo.BindAddress
genericConfig.SecureServingInfo.BindNetwork = options.ServingInfo.BindNetwork
Copy link
Contributor

Choose a reason for hiding this comment

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

you dropped a line here

genericConfig.SecureServingInfo.MinTLSVersion = crypto.TLSVersionOrDie(options.ServingInfo.MinTLSVersion)

@liggitt
Copy link
Contributor

liggitt commented Mar 3, 2017

legitimate failure:

--- FAIL: TestTLSOverrides (5.37s)
07:23:06 	tls_test.go:116: Expected success true, got false with TLS version VersionTLS10 dialing master
07:23:06 	tls_test.go:116: Expected success true, got false with TLS version VersionTLS11 dialing master

@mfojtik
Copy link
Contributor Author

mfojtik commented Mar 3, 2017

@liggitt fixed

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 92da3cc

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 92da3cc

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/799/) (Base Commit: f09f835)

@mfojtik
Copy link
Contributor Author

mfojtik commented Mar 3, 2017

[merge]

@openshift-bot openshift-bot merged commit 4f89148 into openshift:release-1.5 Mar 3, 2017
@mfojtik mfojtik deleted the ciphers_15 branch September 5, 2018 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.5.0
Development

Successfully merging this pull request may close these issues.
3 participants
@mfojtik @liggitt @openshift-bot