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
4ce7bcce
Commit
4ce7bcce
authored
Jan 19, 2018
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
generated
parent
ad168034
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
zz_generated.conversion.go
...et/apis/kubeletconfig/v1alpha1/zz_generated.conversion.go
+2
-0
serving.go
staging/src/k8s.io/apiserver/pkg/server/options/serving.go
+1
-1
No files found.
pkg/kubelet/apis/kubeletconfig/v1alpha1/zz_generated.conversion.go
View file @
4ce7bcce
...
...
@@ -159,6 +159,7 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_kubeletconfig_KubeletConfigura
out
.
TLSCertFile
=
in
.
TLSCertFile
out
.
TLSPrivateKeyFile
=
in
.
TLSPrivateKeyFile
out
.
TLSCipherSuites
=
*
(
*
[]
string
)(
unsafe
.
Pointer
(
&
in
.
TLSCipherSuites
))
out
.
TLSMinVersion
=
in
.
TLSMinVersion
if
err
:=
Convert_v1alpha1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication
(
&
in
.
Authentication
,
&
out
.
Authentication
,
s
);
err
!=
nil
{
return
err
}
...
...
@@ -281,6 +282,7 @@ func autoConvert_kubeletconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigura
out
.
TLSCertFile
=
in
.
TLSCertFile
out
.
TLSPrivateKeyFile
=
in
.
TLSPrivateKeyFile
out
.
TLSCipherSuites
=
*
(
*
[]
string
)(
unsafe
.
Pointer
(
&
in
.
TLSCipherSuites
))
out
.
TLSMinVersion
=
in
.
TLSMinVersion
if
err
:=
Convert_kubeletconfig_KubeletAuthentication_To_v1alpha1_KubeletAuthentication
(
&
in
.
Authentication
,
&
out
.
Authentication
,
s
);
err
!=
nil
{
return
err
}
...
...
staging/src/k8s.io/apiserver/pkg/server/options/serving.go
View file @
4ce7bcce
...
...
@@ -256,6 +256,7 @@ func (s *SecureServingOptions) applyServingInfoTo(c *server.Config) error {
secureServingInfo
.
CipherSuites
=
cipherSuites
}
var
err
error
secureServingInfo
.
MinTLSVersion
,
err
=
utilflag
.
TLSVersion
(
s
.
MinTLSVersion
)
if
err
!=
nil
{
return
err
...
...
@@ -273,7 +274,6 @@ func (s *SecureServingOptions) applyServingInfoTo(c *server.Config) error {
return
fmt
.
Errorf
(
"failed to load SNI cert and key: %v"
,
err
)
}
}
var
err
error
secureServingInfo
.
SNICerts
,
err
=
server
.
GetNamedCertificateMap
(
namedTLSCerts
)
if
err
!=
nil
{
return
err
...
...
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