Skip to content

Commit 3567125

Browse files
committed
Fix in-cluster kubernetes client
1 parent 975f5a0 commit 3567125

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

internal/kube/client.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,25 @@ import (
1111
// CreateKubernetesClient returns a k8s clientset
1212
func CreateKubernetesClient() kubernetes.Interface {
1313
var kubeClient kubernetes.Interface
14-
config, err := rest.InClusterConfig()
14+
_, err := rest.InClusterConfig()
1515
if err != nil {
1616
kubeClient = getClientOutOfCluster()
1717
} else {
18-
kubeClient = getClientInCluster(config)
18+
kubeClient = getClientInCluster()
1919
}
2020

2121
return kubeClient
2222
}
2323

24-
func getClientInCluster(config *rest.Config) kubernetes.Interface {
24+
func getClientInCluster() kubernetes.Interface {
25+
config, err := rest.InClusterConfig()
26+
if err != nil {
27+
log.Fatalf("Can not get kubernetes config: %v", err)
28+
}
29+
2530
clientset, err := kubernetes.NewForConfig(config)
2631
if err != nil {
27-
log.Fatalf("Can not create kube client: %v", err)
32+
log.Fatalf("Can not create kubernetes client: %v", err)
2833
}
2934

3035
return clientset
@@ -42,13 +47,13 @@ func buildOutOfClusterConfig() (*rest.Config, error) {
4247
func getClientOutOfCluster() kubernetes.Interface {
4348
config, err := buildOutOfClusterConfig()
4449
if err != nil {
45-
log.Fatalf("Cannot get kube config: %v", err)
50+
log.Fatalf("Cannot get kubernetes config: %v", err)
4651
}
4752

4853
clientset, err := kubernetes.NewForConfig(config)
4954

5055
if err != nil {
51-
log.Fatalf("Cannot create new kube client from config: %v", err)
56+
log.Fatalf("Cannot create new kubernetes client from config: %v", err)
5257
}
5358

5459
return clientset

0 commit comments

Comments
 (0)