From ffca22b0ba06bf6b9a6b62592145769c6e7ca6f9 Mon Sep 17 00:00:00 2001 From: ehvs Date: Mon, 15 Jul 2024 12:29:58 +0200 Subject: [PATCH] pkg/cluster: Use Action for fixupClusterSPObjectID --- pkg/cluster/adminupdate_test.go | 2 +- pkg/cluster/install.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/cluster/adminupdate_test.go b/pkg/cluster/adminupdate_test.go index 46ee3e9b8d3..538b0efa78f 100644 --- a/pkg/cluster/adminupdate_test.go +++ b/pkg/cluster/adminupdate_test.go @@ -36,7 +36,7 @@ func TestAdminUpdateSteps(t *testing.T) { "[Action initializeKubernetesClients]", "[Action ensureBillingRecord]", "[Action ensureDefaults]", - "[AuthorizationRetryingAction fixupClusterSPObjectID]", + "[Action fixupClusterSPObjectID]", "[Action fixInfraID]", } diff --git a/pkg/cluster/install.go b/pkg/cluster/install.go index aa740cbc267..a0928d2988a 100644 --- a/pkg/cluster/install.go +++ b/pkg/cluster/install.go @@ -86,11 +86,7 @@ func (m *manager) getZerothSteps() []steps.Step { steps.Action(m.initializeKubernetesClients), // must be first steps.Action(m.ensureBillingRecord), // belt and braces steps.Action(m.ensureDefaults), - - // TODO: this relies on an authorizer that isn't exposed in the manager - // struct, so we'll rebuild the fpAuthorizer and use the error catching - // to advance - steps.AuthorizationRetryingAction(m.fpAuthorizer, m.fixupClusterSPObjectID), + steps.Action(m.fixupClusterSPObjectID), } // Generic fix-up actions that are fairly safe to always take, and don't require a running cluster