Skip to content

Commit

Permalink
Merge branch 'gardener:master' into arch_node_temp
Browse files Browse the repository at this point in the history
  • Loading branch information
sssash18 authored Jan 18, 2024
2 parents 5936184 + c73105b commit 777eda6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 66 deletions.
64 changes: 0 additions & 64 deletions .docforge/manifest.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.51.0-dev
v0.52.0-dev
2 changes: 1 addition & 1 deletion pkg/util/provider/machinecontroller/machine.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func (c *controller) updateNodeToMachine(oldObj, newObj interface{}) {

machine, err := c.getMachineFromNode(node.Name)
if err != nil {
klog.Errorf("Unable to handle update event for node %s, couldn't fetch machine %s, Error: %s", machine.Name, err)
klog.Errorf("Unable to handle update event for node %s, couldn't fetch associated machine. Error: %s", node.Name, err)
return
}

Expand Down

0 comments on commit 777eda6

Please sign in to comment.