Make log message more verbose, and add todos to remove these later

openshift · Jan 26, 2021 · f6bb5a8 · f6bb5a8
1 parent e181c4d
commit f6bb5a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/operator/controller/ingress/controller.go b/pkg/operator/controller/ingress/controller.go
@@ -230,9 +230,9 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// TODO: remove this fix-up logic in 4.8
 	if ingress.Status.EndpointPublishingStrategy != nil && ingress.Status.EndpointPublishingStrategy.Type == operatorv1.LoadBalancerServiceStrategyType && ingress.Status.EndpointPublishingStrategy.LoadBalancer == nil {
-		log.Info("EndpointPublishingStrategy missing LoadBalancer")
-		// set loadbalancer to external
+		log.Info("Setting default value for empty status.endpointPublishingStrategy.loadBalancer field", "ingresscontroller", ingress)
 		ingress.Status.EndpointPublishingStrategy.LoadBalancer = &operatorv1.LoadBalancerStrategy{
 			Scope: operatorv1.ExternalLoadBalancer,
 		}

diff --git a/pkg/operator/controller/ingress/status.go b/pkg/operator/controller/ingress/status.go
@@ -110,6 +110,7 @@ func MergeConditions(conditions []operatorv1.OperatorCondition, updates ...opera
 // Returns the updated condition array.
 func PruneConditions(conditions []operatorv1.OperatorCondition) []operatorv1.OperatorCondition {
 	for i, condition := range conditions {
+		// TODO: Remove this fix-up logic in 4.8
 		if condition.Type == "DeploymentDegraded" {
 			// DeploymentDegraded was removed in 4.6.0
 			conditions = append(conditions[:i], conditions[i+1:]...)