Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e156aca4
Unverified
Commit
e156aca4
authored
Mar 01, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Plumb cipher/tls version serving options
parent
f657607d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
config.go
staging/src/k8s.io/apiserver/pkg/server/config.go
+8
-0
serve.go
staging/src/k8s.io/apiserver/pkg/server/serve.go
+7
-0
No files found.
staging/src/k8s.io/apiserver/pkg/server/config.go
View file @
e156aca4
...
...
@@ -185,6 +185,14 @@ type SecureServingInfo struct {
// ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates
ClientCA
*
x509
.
CertPool
// MinTLSVersion optionally overrides the minimum TLS version supported.
// Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants).
MinTLSVersion
uint16
// CipherSuites optionally overrides the list of allowed cipher suites for the server.
// Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants).
CipherSuites
[]
uint16
}
// NewConfig returns a Config struct with the default values
...
...
staging/src/k8s.io/apiserver/pkg/server/serve.go
View file @
e156aca4
...
...
@@ -56,6 +56,13 @@ func (s *GenericAPIServer) serveSecurely(stopCh <-chan struct{}) error {
},
}
if
s
.
SecureServingInfo
.
MinTLSVersion
>
0
{
secureServer
.
TLSConfig
.
MinVersion
=
s
.
SecureServingInfo
.
MinTLSVersion
}
if
len
(
s
.
SecureServingInfo
.
CipherSuites
)
>
0
{
secureServer
.
TLSConfig
.
CipherSuites
=
s
.
SecureServingInfo
.
CipherSuites
}
if
s
.
SecureServingInfo
.
Cert
!=
nil
{
secureServer
.
TLSConfig
.
Certificates
=
[]
tls
.
Certificate
{
*
s
.
SecureServingInfo
.
Cert
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment