diff --git a/pkg/monitor/cluster/certificateexpirationstatuses.go b/pkg/monitor/cluster/certificateexpirationstatuses.go index 163d4847684..057016aac0f 100644 --- a/pkg/monitor/cluster/certificateexpirationstatuses.go +++ b/pkg/monitor/cluster/certificateexpirationstatuses.go @@ -42,7 +42,7 @@ func (mon *Monitor) emitCertificateExpirationStatuses(ctx context.Context) error if dns.IsManagedDomain(mon.oc.Properties.ClusterProfile.Domain) { ic := &operatorv1.IngressController{} - err := mon.clientset.Get(ctx, client.ObjectKey{ + err := mon.ocpclientset.Get(ctx, client.ObjectKey{ Namespace: ingressNamespace, Name: ingressName, }, ic) @@ -77,7 +77,7 @@ func (mon *Monitor) emitCertificateExpirationStatuses(ctx context.Context) error func (mon *Monitor) getCertificate(ctx context.Context, secretNamespace, secretName, secretKey string) (*x509.Certificate, error) { secret := &corev1.Secret{} - err := mon.clientset.Get(ctx, client.ObjectKey{ + err := mon.ocpclientset.Get(ctx, client.ObjectKey{ Namespace: secretNamespace, Name: secretName, }, secret) diff --git a/pkg/monitor/cluster/certificateexpirationstatuses_test.go b/pkg/monitor/cluster/certificateexpirationstatuses_test.go index 0f0b300a784..9c6f9d11f44 100644 --- a/pkg/monitor/cluster/certificateexpirationstatuses_test.go +++ b/pkg/monitor/cluster/certificateexpirationstatuses_test.go @@ -215,14 +215,14 @@ func buildMonitor(m *mock_metrics.MockEmitter, domain, id string, secrets ...cli }, } - clientset := fake. + ocpclientset := fake. NewClientBuilder(). WithObjects(ingressController). WithObjects(secrets...). Build() mon := &Monitor{ - clientset: clientset, - m: m, + ocpclientset: ocpclientset, + m: m, oc: &api.OpenShiftCluster{ Properties: api.OpenShiftClusterProperties{ ClusterProfile: api.ClusterProfile{ diff --git a/pkg/monitor/cluster/cluster.go b/pkg/monitor/cluster/cluster.go index cfc7633952e..89a320ebd9f 100644 --- a/pkg/monitor/cluster/cluster.go +++ b/pkg/monitor/cluster/cluster.go @@ -41,7 +41,7 @@ type Monitor struct { m metrics.Emitter arocli aroclient.Interface - clientset client.Client + ocpclientset client.Client hiveclientset client.Client // access below only via the helper functions in cache.go @@ -92,7 +92,7 @@ func NewMonitor(log *logrus.Entry, restConfig *rest.Config, oc *api.OpenShiftClu return nil, err } - clientset, err := client.New(restConfig, client.Options{}) + ocpclientset, err := client.New(restConfig, client.Options{}) if err != nil { return nil, err } @@ -116,7 +116,7 @@ func NewMonitor(log *logrus.Entry, restConfig *rest.Config, oc *api.OpenShiftClu mcocli: mcocli, arocli: arocli, m: m, - clientset: clientset, + ocpclientset: ocpclientset, hiveclientset: hiveclientset, }, nil }