Merge pull request #5493 from openshift/fix-pki-condition-update

openshift-merge-bot[bot] · web-flow · commit daebc00cd189 · 2025-01-29T18:58:31.000Z
OCPBUGS-48519: fix overwriting PKI operator HCP conditions
diff --git a/control-plane-pki-operator/certrotationcontroller/certrotationcontroller.go b/control-plane-pki-operator/certrotationcontroller/certrotationcontroller.go
@@ -132,7 +132,7 @@ func NewCertRotationController(
 			},
 		},
 		eventRecorder,
-		clienthelpers.NewHostedControlPlaneStatusReporter(hostedControlPlane.Name, hostedControlPlane.Namespace, hypershiftClient),
+		clienthelpers.NewHostedControlPlaneStatusReporter(hostedControlPlane.Name, hostedControlPlane.Namespace, rotatorName, hypershiftClient),
 	)
 	ret.certRotators = append(ret.certRotators, certRotator)
 
@@ -190,7 +190,7 @@ func NewCertRotationController(
 			},
 		},
 		eventRecorder,
-		clienthelpers.NewHostedControlPlaneStatusReporter(hostedControlPlane.Name, hostedControlPlane.Namespace, hypershiftClient),
+		clienthelpers.NewHostedControlPlaneStatusReporter(hostedControlPlane.Name, hostedControlPlane.Namespace, sreRotatorName, hypershiftClient),
 	)
 	ret.certRotators = append(ret.certRotators, sreCertRotator)
 
diff --git a/control-plane-pki-operator/clienthelpers/conditions.go b/control-plane-pki-operator/clienthelpers/conditions.go
@@ -16,10 +16,11 @@ import (
 	clientgoapplyconfig "k8s.io/client-go/applyconfigurations/meta/v1"
 )
 
-func NewHostedControlPlaneStatusReporter(name, namespace string, client hypershiftv1beta1client.HostedControlPlanesGetter) *HostedControlPlaneStatusReporter {
+func NewHostedControlPlaneStatusReporter(name, namespace, rotator string, client hypershiftv1beta1client.HostedControlPlanesGetter) *HostedControlPlaneStatusReporter {
 	return &HostedControlPlaneStatusReporter{
 		namespace: namespace,
 		name:      name,
+		rotator:   rotator,
 		client:    client,
 	}
 }
@@ -28,6 +29,9 @@ type HostedControlPlaneStatusReporter struct {
 	// namespace, name identify the HostedControlPlane we report to
 	namespace, name string
 
+	// name of the rotating controller
+	rotator string
+
 	client hypershiftv1beta1client.HostedControlPlanesGetter
 }
 
@@ -43,7 +47,7 @@ func (h *HostedControlPlaneStatusReporter) Report(ctx context.Context, condition
 		newCondition.Message = syncErr.Error()
 	}
 
-	return UpdateHostedControlPlaneStatusCondition(ctx, newCondition, h.namespace, h.name, "cert-rotation-controller", h.client)
+	return UpdateHostedControlPlaneStatusCondition(ctx, newCondition, h.namespace, h.name, h.rotator+"-cert-rotation-controller", h.client)
 }
 
 var _ certrotation.StatusReporter = (*HostedControlPlaneStatusReporter)(nil)

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,11 @@ import (`
`16`	`16`	`clientgoapplyconfig "k8s.io/client-go/applyconfigurations/meta/v1"`
`17`	`17`	`)`
`18`	`18`
`19`		`-func NewHostedControlPlaneStatusReporter(name, namespace string, client hypershiftv1beta1client.HostedControlPlanesGetter) *HostedControlPlaneStatusReporter {`
	`19`	`+func NewHostedControlPlaneStatusReporter(name, namespace, rotator string, client hypershiftv1beta1client.HostedControlPlanesGetter) *HostedControlPlaneStatusReporter {`
`20`	`20`	`return &HostedControlPlaneStatusReporter{`
`21`	`21`	`namespace: namespace,`
`22`	`22`	`name: name,`
	`23`	`+ rotator: rotator,`
`23`	`24`	`client: client,`
`24`	`25`	`}`
`25`	`26`	`}`
`@@ -28,6 +29,9 @@ type HostedControlPlaneStatusReporter struct {`
`28`	`29`	`// namespace, name identify the HostedControlPlane we report to`
`29`	`30`	`namespace, name string`
`30`	`31`
	`32`	`+ // name of the rotating controller`
	`33`	`+ rotator string`
	`34`	`+`
`31`	`35`	`client hypershiftv1beta1client.HostedControlPlanesGetter`
`32`	`36`	`}`
`33`	`37`
`@@ -43,7 +47,7 @@ func (h *HostedControlPlaneStatusReporter) Report(ctx context.Context, condition`
`43`	`47`	`newCondition.Message = syncErr.Error()`
`44`	`48`	`}`
`45`	`49`
`46`		`- return UpdateHostedControlPlaneStatusCondition(ctx, newCondition, h.namespace, h.name, "cert-rotation-controller", h.client)`
	`50`	`+ return UpdateHostedControlPlaneStatusCondition(ctx, newCondition, h.namespace, h.name, h.rotator+"-cert-rotation-controller", h.client)`
`47`	`51`	`}`
`48`	`52`
`49`	`53`	`var _ certrotation.StatusReporter = (*HostedControlPlaneStatusReporter)(nil)`