fix tests

Author: ajp-io

cmd/installer/cli/enable_ha.go

@@ -74,9 +74,9 @@ func runEnableHA(ctx context.Context, flags EnableHACmdFlags) error {
 
 	if config.HasCustomRoles() {
 		controllerRoleName := config.GetControllerRoleName()
-		logrus.Info("\nHigh availability can be enabled once you have three or more %s nodes.", controllerRoleName)
+		logrus.Infof("\nHigh availability can be enabled once you have three or more %s nodes.", controllerRoleName)
 		logrus.Info("Enabling it will replicate data across cluster nodes.")
-		logrus.Info("After HA is enabled, you must maintain at least three %s nodes.\n", controllerRoleName)
+		logrus.Infof("After HA is enabled, you must maintain at least three %s nodes.\n", controllerRoleName)
 	} else {
 		logrus.Info("\nHigh availability can be enabled once you have three or more nodes.")
 		logrus.Info("Enabling it will replicate data across cluster nodes.")

cmd/installer/cli/install.go

@@ -529,8 +529,8 @@ func verifyChannelRelease(cmdName string, isAirgap bool, assumeYes bool) error {
 	channelRelease := release.GetChannelRelease()
 
 	if channelRelease != nil && channelRelease.Airgap && !isAirgap && !assumeYes {
-		logrus.Warnf("You downloaded an air gap bundle but didn't provide it with --airgap-bundle.")
-		logrus.Warnf("If you continue, the %s will not use an air gap bundle and will connect to the internet.", cmdName)
+		logrus.Warnf("\nYou downloaded an air gap bundle but didn't provide it with --airgap-bundle.")
+		logrus.Warnf("If you continue, the %s will not use an air gap bundle and will connect to the internet.\n", cmdName)
 		if !prompts.New().Confirm(fmt.Sprintf("Do you want to proceed with an online %s?", cmdName), false) {
 			// TODO: send aborted metrics event
 			return NewErrorNothingElseToAdd(errors.New("user aborted: air gap bundle downloaded but flag not provided"))

cmd/installer/cli/restore.go

@@ -345,7 +345,7 @@ func runRestoreStepNew(ctx context.Context, name string, flags InstallCmdFlags,
 	}
 
 	if !s3BackupStoreHasData(s3Store) {
-		logrus.Infof("You'll be guided through the process of restoring %s from a backup.\n", name)
+		logrus.Infof("\nYou'll be guided through the process of restoring %s from a backup.\n", name)
 		logrus.Info("Enter information to configure access to your backup storage location.\n")
 
 		promptForS3BackupStore(s3Store)

tests/integration/kind/registry/ha_test.go

@@ -123,7 +123,7 @@ func TestRegistry_EnableHAAirgap(t *testing.T) {
 	loading := newTestingSpinner(t)
 	func() {
 		defer loading.Close()
-		err = addons.EnableHA(ctx, kcli, kclient, hcli, true, "10.96.0.0/12", nil, cfgSpec, loading)
+		err = addons.EnableHA(ctx, kcli, kclient, hcli, true, "10.96.0.0/12", nil, cfgSpec)
 		require.NoError(t, err)
 	}()
 
@@ -185,7 +185,7 @@ func enableHAAndCancelContextOnMessage(
 	defer loading.Close()
 
 	t.Log("enabling HA and cancelling context on message")
-	err = addons.EnableHA(ctx, kcli, kclient, hcli, true, "10.96.0.0/12", nil, cfgSpec, loading)
+	err = addons.EnableHA(ctx, kcli, kclient, hcli, true, "10.96.0.0/12", nil, cfgSpec)
 	require.ErrorIs(t, err, context.Canceled, "expected context to be cancelled")
 	t.Logf("cancelled context and got error: %v", err)
 }