Skip to content

Commit 730db3c

Browse files
authored
Merge pull request kubernetes#3373 from ellistarn/kubemark
[cluster-autoscaler] Skip nodes that are not Kubemark nodes
2 parents c37dc5f + c52a5dc commit 730db3c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ package kubemark
2323

2424
import (
2525
"fmt"
26+
"os"
27+
"strings"
28+
2629
apiv1 "k8s.io/api/core/v1"
2730
"k8s.io/apimachinery/pkg/api/resource"
2831
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
@@ -35,7 +38,6 @@ import (
3538
"k8s.io/client-go/tools/clientcmd"
3639
"k8s.io/kubernetes/pkg/kubemark"
3740
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
38-
"os"
3941

4042
klog "k8s.io/klog/v2"
4143
)
@@ -120,6 +122,10 @@ func (kubemark *KubemarkCloudProvider) Pricing() (cloudprovider.PricingModel, er
120122

121123
// NodeGroupForNode returns the node group for the given node.
122124
func (kubemark *KubemarkCloudProvider) NodeGroupForNode(node *apiv1.Node) (cloudprovider.NodeGroup, error) {
125+
// Skip nodes that are not managed by Kubemark Cloud Provider.
126+
if !strings.HasPrefix(node.Spec.ProviderID, ProviderName) {
127+
return nil, nil
128+
}
123129
nodeGroupName, err := kubemark.kubemarkController.GetNodeGroupForNode(node.ObjectMeta.Name)
124130
if err != nil {
125131
return nil, err

0 commit comments

Comments
 (0)