Fix the nil pointer dereference

Author: deepsm007

pkg/operator/clusteroperator.go

@@ -11,6 +11,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
+	"k8s.io/utils/clock"
 
 	configv1 "github.com/openshift/api/config/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
@@ -131,6 +132,7 @@ func (c *ClusterOperatorStatusController) sync() error {
 		cr,
 		imagepruner,
 		c.relatedObjects,
+		clock.RealClock{},
 	)
 
 	return resource.ApplyMutator(mut)

pkg/resource/clusteroperator.go

@@ -14,6 +14,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	appslisters "k8s.io/client-go/listers/apps/v1"
+	"k8s.io/utils/clock"
 
 	configv1 "github.com/openshift/api/config/v1"
 	imageregistryv1 "github.com/openshift/api/imageregistry/v1"
@@ -119,6 +120,7 @@ type generatorClusterOperator struct {
 	deployLister   appslisters.DeploymentNamespaceLister
 	configLister   configlisters.ClusterOperatorLister
 	configClient   configv1client.ClusterOperatorsGetter
+	clock          clock.PassiveClock
 }
 
 func NewGeneratorClusterOperator(
@@ -128,6 +130,7 @@ func NewGeneratorClusterOperator(
 	cr *imageregistryv1.Config,
 	imagePruner *imageregistryv1.ImagePruner,
 	relatedObjects []configv1.ObjectReference,
+	clock clock.PassiveClock,
 ) *generatorClusterOperator {
 	return &generatorClusterOperator{
 		deployLister:   deployLister,
@@ -136,6 +139,7 @@ func NewGeneratorClusterOperator(
 		cr:             cr,
 		imagePruner:    imagePruner,
 		relatedObjects: relatedObjects,
+		clock:          clock,
 	}
 }
 
@@ -219,9 +223,9 @@ func (gco *generatorClusterOperator) syncConditions(op *configv1.ClusterOperator
 	}
 
 	oldStatus := op.Status.DeepCopy()
-	configv1helpers.SetStatusCondition(&op.Status.Conditions, unionCondition("Available", operatorv1.ConditionTrue, conditions), nil)
-	configv1helpers.SetStatusCondition(&op.Status.Conditions, unionCondition("Progressing", operatorv1.ConditionFalse, conditions), nil)
-	configv1helpers.SetStatusCondition(&op.Status.Conditions, unionCondition("Degraded", operatorv1.ConditionFalse, conditions), nil)
+	configv1helpers.SetStatusCondition(&op.Status.Conditions, unionCondition("Available", operatorv1.ConditionTrue, conditions), gco.clock)
+	configv1helpers.SetStatusCondition(&op.Status.Conditions, unionCondition("Progressing", operatorv1.ConditionFalse, conditions), gco.clock)
+	configv1helpers.SetStatusCondition(&op.Status.Conditions, unionCondition("Degraded", operatorv1.ConditionFalse, conditions), gco.clock)
 	return !equality.Semantic.DeepEqual(oldStatus, &op.Status)
 }
 

pkg/resource/clusteroperator_test.go

@@ -9,6 +9,7 @@ import (
 	kerror "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
+	"k8s.io/utils/clock"
 
 	cfgapi "github.com/openshift/api/config/v1"
 	imregv1 "github.com/openshift/api/imageregistry/v1"
@@ -263,7 +264,7 @@ func TestSyncVersions(t *testing.T) {
 
 			lister.deploys, lister.failOnGet = tt.deploys, tt.failOnGet
 			gen := NewGeneratorClusterOperator(
-				lister, nil, nil, tt.config, nil, nil,
+				lister, nil, nil, tt.config, nil, nil, clock.RealClock{},
 			)
 
 			modified, err := gen.syncVersions(co)