mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #50769 from bskiba/rem
Automatic merge from submit-queue (batch tested with PRs 50769, 50739) Make removing nodes public for Kubemark controller The ability to remove a specific node is needed by Cluster Autoscaler to work. **Release note**: ``` NONE ```
This commit is contained in:
commit
e8bd71174c
@ -190,7 +190,7 @@ func (kubemarkController *KubemarkController) SetNodeGroupSize(nodeGroup string,
|
|||||||
if i == absDelta {
|
if i == absDelta {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if err := kubemarkController.removeNodeFromNodeGroup(nodeGroup, node); err != nil {
|
if err := kubemarkController.RemoveNodeFromNodeGroup(nodeGroup, node); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -240,7 +240,7 @@ func (kubemarkController *KubemarkController) addNodeToNodeGroup(nodeGroup strin
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (kubemarkController *KubemarkController) removeNodeFromNodeGroup(nodeGroup string, node string) error {
|
func (kubemarkController *KubemarkController) RemoveNodeFromNodeGroup(nodeGroup string, node string) error {
|
||||||
pod := kubemarkController.getPodByName(node)
|
pod := kubemarkController.getPodByName(node)
|
||||||
if pod == nil {
|
if pod == nil {
|
||||||
glog.Warningf("Can't delete node %s from nodegroup %s. Node does not exist.", node, nodeGroup)
|
glog.Warningf("Can't delete node %s from nodegroup %s. Node does not exist.", node, nodeGroup)
|
||||||
|
Loading…
Reference in New Issue
Block a user