From d595c413fd6c3b251594614564cace46c0b33f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maiti=C3=BA=20=C3=93=20Ciar=C3=A1in?= Date: Wed, 7 Feb 2024 15:34:22 +0100 Subject: [PATCH] Revise the updateOperator Task --- pkg/cluster/adminupdate_test.go | 6 +++--- pkg/cluster/install.go | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/adminupdate_test.go b/pkg/cluster/adminupdate_test.go index 135bb23ef3d..9a71f56f1e2 100644 --- a/pkg/cluster/adminupdate_test.go +++ b/pkg/cluster/adminupdate_test.go @@ -96,7 +96,7 @@ func TestAdminUpdateSteps(t *testing.T) { doc.OpenShiftCluster.Properties.MaintenanceTask = api.MaintenanceTaskOperator return doc, true }, - shouldRunSteps: concatMultipleSlices(zerothSteps, operatorUpdateSteps), + shouldRunSteps: concatMultipleSlices(zerothSteps, certificateRenewalSteps, operatorUpdateSteps), }, { name: "ARO Operator Update on <= 4.6 cluster does not update operator", @@ -107,7 +107,7 @@ func TestAdminUpdateSteps(t *testing.T) { doc.OpenShiftCluster.Properties.ClusterProfile.Version = "4.6.62" return doc, true }, - shouldRunSteps: zerothSteps, + shouldRunSteps: concatMultipleSlices(zerothSteps, certificateRenewalSteps), }, { name: "ARO Operator Update on 4.7.0 cluster does update operator", @@ -118,7 +118,7 @@ func TestAdminUpdateSteps(t *testing.T) { doc.OpenShiftCluster.Properties.ClusterProfile.Version = "4.7.0" return doc, true }, - shouldRunSteps: concatMultipleSlices(zerothSteps, operatorUpdateSteps), + shouldRunSteps: concatMultipleSlices(zerothSteps, certificateRenewalSteps, operatorUpdateSteps), }, { name: "Everything update and adopt Hive.", diff --git a/pkg/cluster/install.go b/pkg/cluster/install.go index 1df9bb3f87f..a532c43ed37 100644 --- a/pkg/cluster/install.go +++ b/pkg/cluster/install.go @@ -67,10 +67,13 @@ func (m *manager) adminUpdate() []steps.Step { if m.adoptViaHive && !m.clusterWasCreatedByHive() { stepsToRun = append(stepsToRun, m.getHiveAdoptionAndReconciliationSteps()...) } + } else if isOperator { + stepsToRun = append(stepsToRun, m.getCertificateRenewalSteps()...) + if m.shouldUpdateOperator() { + stepsToRun = append(stepsToRun, m.getOperatorUpdateSteps()...) + } } else if isRenewCerts { stepsToRun = append(stepsToRun, m.getCertificateRenewalSteps()...) - } else if isOperator && m.shouldUpdateOperator() { - stepsToRun = append(stepsToRun, m.getOperatorUpdateSteps()...) } // We don't run this on an operator-only deploy as PUCM scripts then cannot