github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101389 from caesarxuchao/loopback

Browse Source 
Switch the order of adding SNICert and creating LoopbackClientConfig
This commit is contained in:
Kubernetes Prow Robot 2021-05-04 17:15:14 -07:00 committed by GitHub
commit 4bfde34102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/server/options/serving_with_loopback.go
View File

@ -60,10 +60,14 @@ func (s *SecureServingOptionsWithLoopback) ApplyTo(secureServingInfo **server.Se
return fmt.Errorf("failed to generate self-signed certificate for loopback connection: %v", err) return fmt.Errorf("failed to generate self-signed certificate for loopback connection: %v", err)
} }
// Write to the front of SNICerts so that this overrides any other certs with the same name
(*secureServingInfo).SNICerts = append([]dynamiccertificates.SNICertKeyContentProvider{certProvider}, (*secureServingInfo).SNICerts...)
secureLoopbackClientConfig, err := (*secureServingInfo).NewLoopbackClientConfig(uuid.New().String(), certPem) secureLoopbackClientConfig, err := (*secureServingInfo).NewLoopbackClientConfig(uuid.New().String(), certPem)
switch { switch {
// if we failed and there's no fallback loopback client config, we need to fail // if we failed and there's no fallback loopback client config, we need to fail
case err != nil && *loopbackClientConfig == nil: case err != nil && *loopbackClientConfig == nil:
(*secureServingInfo).SNICerts = (*secureServingInfo).SNICerts[1:]
return err return err
// if we failed, but we already have a fallback loopback client config (usually insecure), allow it // if we failed, but we already have a fallback loopback client config (usually insecure), allow it
@ -71,8 +75,6 @@ func (s *SecureServingOptionsWithLoopback) ApplyTo(secureServingInfo **server.Se
default: default:
*loopbackClientConfig = secureLoopbackClientConfig *loopbackClientConfig = secureLoopbackClientConfig
// Write to the front of SNICerts so that this overrides any other certs with the same name
(*secureServingInfo).SNICerts = append([]dynamiccertificates.SNICertKeyContentProvider{certProvider}, (*secureServingInfo).SNICerts...)
} }
return nil return nil

51
staging/src/k8s.io/apiserver/pkg/server/options/serving_with_loopback_test.go Normal file
View File

@ -0,0 +1,51 @@
/*
Copyright 2021 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package options
import (
"net"
"testing"
"k8s.io/apiserver/pkg/server"
"k8s.io/client-go/rest"
)
func TestEmptyMainCert(t *testing.T) {
secureServingInfo := &server.SecureServingInfo{}
var loopbackClientConfig *rest.Config
s := (&SecureServingOptions{
BindAddress: net.ParseIP("127.0.0.1"),
}).WithLoopback()
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatalf("failed to listen on 127.0.0.1:0")
}
defer ln.Close()
s.Listener = ln
s.BindPort = ln.Addr().(*net.TCPAddr).Port
if err := s.ApplyTo(&secureServingInfo, &loopbackClientConfig); err != nil {
t.Errorf("unexpected error: %v", err)
}
if loopbackClientConfig == nil {
t.Errorf("unexpected empty loopbackClientConfig")
}
if e, a := 1, len(secureServingInfo.SNICerts); e != a {
t.Errorf("expected %d SNICert, got %d", e, a)
}
}