Skip to content

Commit 7fc6faa

Browse files
authored
Merge pull request #7156 from Duke0404/master
Support using in-cluster kubeconfig
2 parents 51c7719 + 351748c commit 7fc6faa

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

cluster-autoscaler/utils/kubernetes/client.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ import (
2828
)
2929

3030
const (
31-
failedToBuildConfigErr = "Failed to build config"
32-
failedToParseK8sUrlErr = "Failed to parse Kubernetes url"
33-
failedToBuildClientConfigErr = "Failed to build Kubernetes client configuration"
31+
failedToBuildConfigErr = "Failed to build config"
32+
failedToParseK8sUrlErr = "Failed to parse Kubernetes url"
33+
failedToBuildClientConfigErr = "Failed to build Kubernetes client configuration"
34+
failedToFindInClusterConfigErr = "Failed to find in-cluster config"
3435
)
3536

3637
// CreateKubeClient creates kube client based on AutoscalingOptions.KubeClientOptions
@@ -50,7 +51,7 @@ func GetKubeConfig(opts config.KubeClientOptions) *rest.Config {
5051
if err != nil {
5152
klog.Fatalf("%v: %v", failedToBuildConfigErr, err)
5253
}
53-
} else {
54+
} else if opts.Master != "" {
5455
url, err := url.Parse(opts.Master)
5556
if err != nil {
5657
klog.Fatalf("%v: %v", failedToParseK8sUrlErr, err)
@@ -60,8 +61,12 @@ func GetKubeConfig(opts config.KubeClientOptions) *rest.Config {
6061
if err != nil {
6162
klog.Fatalf("%v: %v", failedToBuildClientConfigErr, err)
6263
}
64+
} else {
65+
kubeConfig, err = rest.InClusterConfig()
66+
if err != nil {
67+
klog.Fatalf("%v: %v", failedToFindInClusterConfigErr, err)
68+
}
6369
}
64-
6570
kubeConfig.QPS = opts.KubeClientQPS
6671
kubeConfig.Burst = opts.KubeClientBurst
6772
kubeConfig.ContentType = opts.APIContentType

0 commit comments

Comments
 (0)