OSD-6918 Rename managed CR to managed-upgrade-config

README.md

@@ -56,7 +56,7 @@ If you like to contribute to the Managed Upgrade Operator, please read our [Cont
 apiVersion: upgrade.managed.openshift.io/v1alpha1
 kind: UpgradeConfig
 metadata:
-  name: osd-upgrade-config
+  name: managed-upgrade-config
 spec:
   type: "OSD"
   upgradeAt: "2020-01-01T00:00:00Z"

pkg/controller/upgradeconfig/upgradeconfig_controller.go

@@ -2,6 +2,7 @@ package upgradeconfig
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -73,7 +74,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 	}
 
 	// Watch for changes to primary resource UpgradeConfig, status change will not trigger a reconcile
-	err = c.Watch(&source.Kind{Type: &upgradev1alpha1.UpgradeConfig{}}, &handler.EnqueueRequestForObject{}, StatusChangedPredicate, OSDUpgradePredicate)
+	err = c.Watch(&source.Kind{Type: &upgradev1alpha1.UpgradeConfig{}}, &handler.EnqueueRequestForObject{}, StatusChangedPredicate, ManagedUpgradePredicate)
 	if err != nil {
 		return err
 	}
@@ -192,7 +193,7 @@ func (r *ReconcileUpgradeConfig) Reconcile(request reconcile.Request) (reconcile
 			return reconcile.Result{}, err
 		}
 
-		reqLogger.Info("Checking if cluster can commence upgrade.")
+		reqLogger.Info(fmt.Sprintf("Checking if cluster can commence %s upgrade.", instance.Spec.Type))
 		schedulerResult := r.scheduler.IsReadyToUpgrade(instance, cfg.GetUpgradeWindowTimeOutDuration())
 		if schedulerResult.IsReady {
 			ucMgr, err := r.ucMgrBuilder.NewManager(r.client)
@@ -210,7 +211,7 @@ func (r *ReconcileUpgradeConfig) Reconcile(request reconcile.Request) (reconcile
 			}
 
 			if remoteChanged {
-				reqLogger.Info("The remote upgrade policy does not match the local upgrade config, applying the new upgrade policy")
+				reqLogger.Info("The cluster's upgrade policy has changed, so the operator will re-reconcile.")
 				return reconcile.Result{}, nil
 			}
 
@@ -229,7 +230,7 @@ func (r *ReconcileUpgradeConfig) Reconcile(request reconcile.Request) (reconcile
 				return reconcile.Result{}, err
 			}
 
-			reqLogger.Info("Cluster is commencing upgrade.", "time", now)
+			reqLogger.Info(fmt.Sprintf("Cluster is commencing %s upgrade.", instance.Spec.Type), "time", now)
 			return r.upgradeCluster(upgrader, instance, reqLogger)
 		}
 
@@ -289,22 +290,22 @@ func (r *ReconcileUpgradeConfig) upgradeCluster(upgrader cub.ClusterUpgrader, uc
 	return reconcile.Result{RequeueAfter: 1 * time.Minute}, me.ErrorOrNil()
 }
 
-var OSDUpgradePredicate = predicate.Funcs{
+var ManagedUpgradePredicate = predicate.Funcs{
 	UpdateFunc: func(e event.UpdateEvent) bool {
-		return isOsdUpgrade(e.MetaNew.GetName())
+		return isManagedUpgrade(e.MetaNew.GetName())
 	},
 	// Create is required to avoid reconciliation at controller initialisation.
 	CreateFunc: func(e event.CreateEvent) bool {
-		return isOsdUpgrade(e.Meta.GetName())
+		return isManagedUpgrade(e.Meta.GetName())
 	},
 	DeleteFunc: func(e event.DeleteEvent) bool {
-		return isOsdUpgrade(e.Meta.GetName())
+		return isManagedUpgrade(e.Meta.GetName())
 	},
 	GenericFunc: func(e event.GenericEvent) bool {
-		return isOsdUpgrade(e.Meta.GetName())
+		return isManagedUpgrade(e.Meta.GetName())
 	},
 }
 
-func isOsdUpgrade(name string) bool {
+func isManagedUpgrade(name string) bool {
 	return name == ucmgr.UPGRADECONFIG_CR_NAME
 }

pkg/controller/upgradeconfig/upgradeconfig_controller_test.go

@@ -80,7 +80,7 @@ var _ = Describe("UpgradeConfigController", func() {
 		mockUCMgrBuilder = ucMgrMocks.NewMockUpgradeConfigManagerBuilder(mockCtrl)
 		mockUCMgr = ucMgrMocks.NewMockUpgradeConfigManager(mockCtrl)
 		upgradeConfigName = types.NamespacedName{
-			Name:      "osd-upgrade-config",
+			Name:      "managed-upgrade-config",
 			Namespace: "test-namespace",
 		}
 		upgradeConfig = testStructs.NewUpgradeConfigBuilder().WithNamespacedName(upgradeConfigName).GetUpgradeConfig()

pkg/eventmanager/eventmanager_test.go

@@ -22,7 +22,7 @@ import (
 
 const (
 	TEST_OPERATOR_NAMESPACE = "openshift-managed-upgrade-operator"
-	TEST_UPGRADECONFIG_CR   = "osd-upgrade-config"
+	TEST_UPGRADECONFIG_CR   = "managed-upgrade-config"
 	TEST_UPGRADE_VERSION    = "4.4.4"
 	TEST_UPGRADE_TIME       = "2020-06-20T00:00:00Z"
 )

pkg/upgradeconfigmanager/upgradeconfigmanager.go

@@ -30,7 +30,7 @@ var log = logf.Log.WithName("upgrade-config-manager")
 
 const (
 	// Name of the Custom Resource that the provider will manage
-	UPGRADECONFIG_CR_NAME = "osd-upgrade-config"
+	UPGRADECONFIG_CR_NAME = "managed-upgrade-config"
 	// Jitter factor (percentage / 100) used to alter watch interval
 	JITTER_FACTOR         = 0.1
 	INITIAL_SYNC_DURATION = 1 * time.Minute

test/deploy/upgrade.managed.openshift.io_v1alpha1_upgradeconfig_cr.yaml

@@ -1,7 +1,7 @@
 apiVersion: upgrade.managed.openshift.io/v1alpha1
 kind: UpgradeConfig
 metadata:
-  name: osd-upgrade-config
+  name: managed-upgrade-config
 spec:
   type: "OSD"
   upgradeAt: "2020-01-01T00:00:00Z"