Skip to content

Bug 1752088: UPSTREAM: <carry>: openshift: Drop isDeleteAllowed func #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 17, 2019
Merged

Bug 1752088: UPSTREAM: <carry>: openshift: Drop isDeleteAllowed func #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions pkg/controller/machine/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package machine
import (
"context"
"fmt"
"os"
"time"

"github.com/go-log/log/info"
Expand Down Expand Up @@ -78,14 +77,8 @@ func newReconciler(mgr manager.Manager, actuator Actuator) reconcile.Reconciler
eventRecorder: mgr.GetEventRecorderFor("machine-controller"),
config: mgr.GetConfig(),
scheme: mgr.GetScheme(),
nodeName: os.Getenv(NodeNameEnvVar),
actuator: actuator,
}

if r.nodeName == "" {
klog.Warningf("Environment variable %q is not set, this controller will not protect against deleting its own machine", NodeNameEnvVar)
}

return r
}

Expand Down Expand Up @@ -113,9 +106,6 @@ type ReconcileMachine struct {
eventRecorder record.EventRecorder

actuator Actuator

// nodeName is the name of the node on which the machine controller is running, if not present, it is loaded from NODE_NAME.
nodeName string
}

// Reconcile reads that state of the cluster for a Machine object and makes changes based on the state read
Expand Down Expand Up @@ -199,13 +189,7 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
return reconcile.Result{}, nil
}

if !r.isDeleteAllowed(m) {
klog.Infof("Deleting machine hosting this controller is not allowed. Skipping reconciliation of machine %q", name)
return reconcile.Result{}, nil
}

klog.Infof("Reconciling machine %q triggers delete", name)

// Drain node before deletion
// If a machine is not linked to a node, just delete the machine. Since a node
// can be unlinked from a machine when the node goes NotReady and is removed
Expand Down Expand Up @@ -334,27 +318,6 @@ func (r *ReconcileMachine) getCluster(ctx context.Context, machine *machinev1.Ma
return cluster, nil
}

func (r *ReconcileMachine) isDeleteAllowed(machine *machinev1.Machine) bool {
if r.nodeName == "" || machine.Status.NodeRef == nil {
return true
}

if machine.Status.NodeRef.Name != r.nodeName {
Copy link

@bison bison Sep 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need the nodeName field at all now? If not, let's remove it.

return true
}

node := &corev1.Node{}
if err := r.Client.Get(context.Background(), client.ObjectKey{Name: r.nodeName}, node); err != nil {
klog.Infof("Failed to determine if controller's node %q is associated with machine %q: %v", r.nodeName, machine.Name, err)
return true
}

// When the UID of the machine's node reference and this controller's actual node match then then the request is to
// delete the machine this machine-controller is running on. Return false to not allow machine controller to delete its
// own machine.
return node.UID != machine.Status.NodeRef.UID
}

func (r *ReconcileMachine) deleteNode(ctx context.Context, name string) error {
var node corev1.Node
if err := r.Client.Get(ctx, client.ObjectKey{Name: name}, &node); err != nil {
Expand Down