github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4517 from liggitt/kubeconfig_cert_data

Browse Source 
Let .kubeconfig be a single-source config for API clients
This commit is contained in:
Jeff Lowdermilk
2015-02-19 10:22:58 -08:00
parent 1b5d14423c abb38cf793
commit 703b642886
13 changed files with 589 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/helper.go
View File

@@ -354,7 +354,9 @@ func IsConfigTransportTLS(config Config) bool {
func defaultServerUrlFor(config *Config) (*url.URL, error) {
// TODO: move the default to secure when the apiserver supports TLS by default
// config.Insecure is taken to mean "I want HTTPS but don't bother checking the certs against a CA."
defaultTLS := config.CertFile != "" || config.Insecure
hasCA := len(config.CAFile) != 0 || len(config.CAData) != 0
hasCert := len(config.CertFile) != 0 || len(config.CertData) != 0
defaultTLS := hasCA || hasCert || config.Insecure
host := config.Host
if host == "" {
host = "localhost"