Overriding CA file should override skip TLS and CA data

Kubernetes-commit: 857572168e79430af2dbf05e9d4705dfb3f0d99b
This commit is contained in:
Jordan Liggitt
2019-10-06 13:40:21 -04:00
committed by Kubernetes Publisher
parent b1fd789501
commit 24302e441b
2 changed files with 32 additions and 6 deletions

View File

@@ -148,7 +148,7 @@ func TestInsecureOverridesCA(t *testing.T) {
actualCfg, err := clientBuilder.ClientConfig()
if err != nil {
t.Errorf("Unexpected error: %v", err)
t.Fatalf("Unexpected error: %v", err)
}
matchBoolArg(true, actualCfg.Insecure, t)
@@ -156,6 +156,30 @@ func TestInsecureOverridesCA(t *testing.T) {
matchByteArg(nil, actualCfg.TLSClientConfig.CAData, t)
}
func TestCAOverridesCAData(t *testing.T) {
file, err := ioutil.TempFile("", "my.ca")
if err != nil {
t.Fatalf("could not create tempfile: %v", err)
}
defer os.Remove(file.Name())
config := createCAValidTestConfig()
clientBuilder := NewNonInteractiveClientConfig(*config, "clean", &ConfigOverrides{
ClusterInfo: clientcmdapi.Cluster{
CertificateAuthority: file.Name(),
},
}, nil)
actualCfg, err := clientBuilder.ClientConfig()
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
matchBoolArg(false, actualCfg.Insecure, t)
matchStringArg(file.Name(), actualCfg.TLSClientConfig.CAFile, t)
matchByteArg(nil, actualCfg.TLSClientConfig.CAData, t)
}
func TestMergeContext(t *testing.T) {
const namespace = "overridden-namespace"