Merge branch 'master' into auto_consistency_fix
This commit is contained in:
		@@ -415,6 +415,9 @@ func inClusterConfig() (cluster k8sapi.Cluster, user k8sapi.AuthInfo, namespace
 | 
				
			|||||||
		err = fmt.Errorf("unable to load in-cluster configuration, KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT must be defined")
 | 
							err = fmt.Errorf("unable to load in-cluster configuration, KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT must be defined")
 | 
				
			||||||
		return
 | 
							return
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
						// we need to wrap IPv6 addresses in square brackets
 | 
				
			||||||
 | 
						// IPv4 also works with square brackets
 | 
				
			||||||
 | 
						host = "[" + host + "]"
 | 
				
			||||||
	cluster = k8sapi.Cluster{
 | 
						cluster = k8sapi.Cluster{
 | 
				
			||||||
		Server:               "https://" + host + ":" + port,
 | 
							Server:               "https://" + host + ":" + port,
 | 
				
			||||||
		CertificateAuthority: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
 | 
							CertificateAuthority: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user