Skip to content

Commit a8d31d5

Browse files
committed
Rename Manager fields according to the new value passed
Renamed from onOpenshift to hasMachineAPI Signed-off-by: Carlo Lobrano <[email protected]>
1 parent a78cd29 commit a8d31d5

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

controllers/resources/manager.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ func (r RemediationCRNotOwned) Error() string { return r.msg }
4949

5050
type manager struct {
5151
client.Client
52-
ctx context.Context
53-
log logr.Logger
54-
onOpenshift bool
55-
leaseManager LeaseManager
56-
recorder record.EventRecorder
52+
ctx context.Context
53+
log logr.Logger
54+
hasMachineAPI bool
55+
leaseManager LeaseManager
56+
recorder record.EventRecorder
5757
}
5858

5959
var _ Manager = &manager{}
6060

61-
func NewManager(c client.Client, ctx context.Context, log logr.Logger, onOpenshift bool, leaseManager LeaseManager, recorder record.EventRecorder) Manager {
61+
func NewManager(c client.Client, ctx context.Context, log logr.Logger, hasMachineAPI bool, leaseManager LeaseManager, recorder record.EventRecorder) Manager {
6262
return &manager{
63-
Client: c,
64-
ctx: ctx,
65-
log: log.WithName("resource manager"),
66-
onOpenshift: onOpenshift,
67-
leaseManager: leaseManager,
68-
recorder: recorder,
63+
Client: c,
64+
ctx: ctx,
65+
log: log.WithName("resource manager"),
66+
hasMachineAPI: hasMachineAPI,
67+
leaseManager: leaseManager,
68+
recorder: recorder,
6969
}
7070
}
7171

@@ -76,7 +76,7 @@ func (m *manager) GenerateRemediationCRForNode(node *corev1.Node, owner client.O
7676
// also set the node's machine as owner ref if possible
7777
// TODO also handle CAPI clusters / machines
7878
var machineOwnerRef *metav1.OwnerReference
79-
if m.onOpenshift {
79+
if m.hasMachineAPI {
8080
ref, machineNamespace, err := m.getOwningMachineWithNamespace(node)
8181
if err != nil {
8282
return nil, err

0 commit comments

Comments
 (0)