@@ -23,7 +23,6 @@ package kubemark
23
23
24
24
import (
25
25
"fmt"
26
-
27
26
apiv1 "k8s.io/api/core/v1"
28
27
"k8s.io/apimachinery/pkg/api/resource"
29
28
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
@@ -36,6 +35,7 @@ import (
36
35
"k8s.io/client-go/tools/clientcmd"
37
36
"k8s.io/kubernetes/pkg/kubemark"
38
37
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
38
+ "os"
39
39
40
40
klog "k8s.io/klog/v2"
41
41
)
@@ -197,7 +197,7 @@ func (nodeGroup *NodeGroup) Nodes() ([]cloudprovider.Instance, error) {
197
197
return instances , err
198
198
}
199
199
for _ , node := range nodes {
200
- instances = append (instances , cloudprovider.Instance {Id : ":// //" + node })
200
+ instances = append (instances , cloudprovider.Instance {Id : "kubemark: //" + node })
201
201
}
202
202
return instances , nil
203
203
}
@@ -313,9 +313,13 @@ func BuildKubemark(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDis
313
313
klog .Fatalf ("Failed to get kubeclient config for external cluster: %v" , err )
314
314
}
315
315
316
- kubemarkConfig , err := clientcmd .BuildConfigFromFlags ("" , "/kubeconfig/cluster_autoscaler.kubeconfig" )
317
- if err != nil {
318
- klog .Fatalf ("Failed to get kubeclient config for kubemark cluster: %v" , err )
316
+ // Use provided kubeconfig or fallback to InClusterConfig
317
+ kubemarkConfig := externalConfig
318
+ kubemarkConfigPath := "/kubeconfig/cluster_autoscaler.kubeconfig"
319
+ if _ , err := os .Stat (kubemarkConfigPath ); ! os .IsNotExist (err ) {
320
+ if kubemarkConfig , err = clientcmd .BuildConfigFromFlags ("" , kubemarkConfigPath ); err != nil {
321
+ klog .Fatalf ("Failed to get kubeclient config for kubemark cluster: %v" , err )
322
+ }
319
323
}
320
324
321
325
stop := make (chan struct {})
0 commit comments