diff --git a/pkg/apis/eventing/v1/trigger_lifecycle.go b/pkg/apis/eventing/v1/trigger_lifecycle.go index e961d3979c9..52613289f56 100644 --- a/pkg/apis/eventing/v1/trigger_lifecycle.go +++ b/pkg/apis/eventing/v1/trigger_lifecycle.go @@ -92,11 +92,11 @@ func (ts *TriggerStatus) PropagateBrokerCondition(bc *apis.Condition) { switch { case bc.Status == corev1.ConditionUnknown: - ts.MarkBrokerUnknown(bc.Reason, bc.Message) + ts.MarkBrokerUnknown(bc.Reason, "%s", bc.Message) case bc.Status == corev1.ConditionTrue: triggerCondSet.Manage(ts).MarkTrue(TriggerConditionBroker) case bc.Status == corev1.ConditionFalse: - ts.MarkBrokerFailed(bc.Reason, bc.Message) + ts.MarkBrokerFailed(bc.Reason, "%s", bc.Message) default: ts.MarkBrokerUnknown("BrokerUnknown", "The status of Broker is invalid: %v", bc.Status) } @@ -123,11 +123,11 @@ func (ts *TriggerStatus) PropagateSubscriptionCondition(sc *apis.Condition) { switch { case sc.Status == corev1.ConditionUnknown: - ts.MarkSubscribedUnknown(sc.Reason, sc.Message) + ts.MarkSubscribedUnknown(sc.Reason, "%s", sc.Message) case sc.Status == corev1.ConditionTrue: triggerCondSet.Manage(ts).MarkTrue(TriggerConditionSubscribed) case sc.Status == corev1.ConditionFalse: - ts.MarkNotSubscribed(sc.Reason, sc.Message) + ts.MarkNotSubscribed(sc.Reason, "%s", sc.Message) default: ts.MarkSubscribedUnknown("SubscriptionUnknown", "The status of Subscription is invalid: %v", sc.Status) } @@ -196,11 +196,11 @@ func (ts *TriggerStatus) PropagateDependencyStatus(ks *duckv1.Source) { switch { case kc.Status == corev1.ConditionUnknown: - ts.MarkDependencyUnknown(kc.Reason, kc.Message) + ts.MarkDependencyUnknown(kc.Reason, "%s", kc.Message) case kc.Status == corev1.ConditionTrue: ts.MarkDependencySucceeded() case kc.Status == corev1.ConditionFalse: - ts.MarkDependencyFailed(kc.Reason, kc.Message) + ts.MarkDependencyFailed(kc.Reason, "%s", kc.Message) default: ts.MarkDependencyUnknown("DependencyUnknown", "The status of Dependency is invalid: %v", kc.Status) } diff --git a/pkg/apis/eventing/v1alpha1/eventtransform_lifecycle.go b/pkg/apis/eventing/v1alpha1/eventtransform_lifecycle.go index 5caf1e105b1..4cb48fe57a4 100644 --- a/pkg/apis/eventing/v1alpha1/eventtransform_lifecycle.go +++ b/pkg/apis/eventing/v1alpha1/eventtransform_lifecycle.go @@ -120,11 +120,11 @@ func (ts *EventTransformStatus) PropagateJsonataCertificateStatus(cs cmv1.Certif return false } if topLevel.Status == cmmeta.ConditionUnknown { - transformJsonataConditionSet.Manage(ts).MarkUnknown(TransformationJsonataDeploymentReady, TransformationJsonataCertificateNotReady, "Certificate is progressing, "+topLevel.Reason+" Message: "+topLevel.Message) + transformJsonataConditionSet.Manage(ts).MarkUnknown(TransformationJsonataDeploymentReady, TransformationJsonataCertificateNotReady, "Certificate is progressing, %s Message: %s", topLevel.Reason, topLevel.Message) return false } if topLevel.Status == cmmeta.ConditionFalse { - transformJsonataConditionSet.Manage(ts).MarkFalse(TransformationJsonataDeploymentReady, TransformationJsonataCertificateNotReady, "Certificate is not ready, "+topLevel.Reason+" Message: "+topLevel.Message) + transformJsonataConditionSet.Manage(ts).MarkFalse(TransformationJsonataDeploymentReady, TransformationJsonataCertificateNotReady, "Certificate is not ready, %s Message: %s", topLevel.Reason, topLevel.Message) return false } return true @@ -155,10 +155,10 @@ func (ts *EventTransformStatus) PropagateJsonataSinkBindingStatus(sbs sourcesv1. return true } if topLevel.IsFalse() { - transformJsonataConditionSet.Manage(ts).MarkFalse(TransformationJsonataSinkBindingReady, topLevel.Reason, topLevel.Message) + transformJsonataConditionSet.Manage(ts).MarkFalse(TransformationJsonataSinkBindingReady, topLevel.Reason, "%s", topLevel.Message) return false } - transformJsonataConditionSet.Manage(ts).MarkUnknown(TransformationJsonataSinkBindingReady, topLevel.Reason, topLevel.Message) + transformJsonataConditionSet.Manage(ts).MarkUnknown(TransformationJsonataSinkBindingReady, topLevel.Reason, "%s", topLevel.Message) return false } @@ -187,9 +187,9 @@ func (ts *EventTransformStatus) propagateTransformationConditionStatus(cond *api } else if cond.IsTrue() { ts.GetConditionSet().Manage(ts).MarkTrue(TransformationConditionReady) } else if cond.IsFalse() { - ts.GetConditionSet().Manage(ts).MarkFalse(TransformationConditionReady, cond.Reason, cond.Message) + ts.GetConditionSet().Manage(ts).MarkFalse(TransformationConditionReady, cond.Reason, "%s", cond.Message) } else { - ts.GetConditionSet().Manage(ts).MarkUnknown(TransformationConditionReady, cond.Reason, cond.Message) + ts.GetConditionSet().Manage(ts).MarkUnknown(TransformationConditionReady, cond.Reason, "%s", cond.Message) } } diff --git a/pkg/apis/eventing/v1beta1/eventtype_lifecycle.go b/pkg/apis/eventing/v1beta1/eventtype_lifecycle.go index 139487e197b..b992195d0c7 100644 --- a/pkg/apis/eventing/v1beta1/eventtype_lifecycle.go +++ b/pkg/apis/eventing/v1beta1/eventtype_lifecycle.go @@ -93,11 +93,11 @@ func (et *EventTypeStatus) PropagateBrokerStatus(bs *eventingv1.BrokerStatus) { } switch { case bc.Status == corev1.ConditionUnknown: - et.MarkBrokerUnknown(bc.Reason, bc.Message) + et.MarkBrokerUnknown(bc.Reason, "%s", bc.Message) case bc.Status == corev1.ConditionTrue: eventTypeCondSet.Manage(et).MarkTrue(EventTypeConditionBrokerReady) case bc.Status == corev1.ConditionFalse: - et.MarkBrokerFailed(bc.Reason, bc.Message) + et.MarkBrokerFailed(bc.Reason, "%s", bc.Message) default: et.MarkBrokerUnknown("BrokerUnknown", "The status of Broker is invalid: %v", bc.Status) } diff --git a/pkg/apis/messaging/v1/channel_lifecycle.go b/pkg/apis/messaging/v1/channel_lifecycle.go index c8cf84a1905..86e07d0a54e 100644 --- a/pkg/apis/messaging/v1/channel_lifecycle.go +++ b/pkg/apis/messaging/v1/channel_lifecycle.go @@ -122,11 +122,11 @@ func (cs *ChannelStatus) PropagateStatuses(chs *eventingduck.ChannelableStatus) } else { switch { case readyCondition.Status == corev1.ConditionUnknown: - cs.MarkBackingChannelUnknown(readyCondition.Reason, readyCondition.Message) + cs.MarkBackingChannelUnknown(readyCondition.Reason, "%s", readyCondition.Message) case readyCondition.Status == corev1.ConditionTrue: cs.MarkBackingChannelReady() case readyCondition.Status == corev1.ConditionFalse: - cs.MarkBackingChannelFailed(readyCondition.Reason, readyCondition.Message) + cs.MarkBackingChannelFailed(readyCondition.Reason, "%s", readyCondition.Message) default: cs.MarkBackingChannelUnknown("BackingChannelUnknown", "The status of BackingChannel is invalid: %v", readyCondition.Status) } diff --git a/pkg/apis/sinks/v1alpha1/integration_sink_lifecycle.go b/pkg/apis/sinks/v1alpha1/integration_sink_lifecycle.go index 78e1418b9f4..186a5d4b1d4 100644 --- a/pkg/apis/sinks/v1alpha1/integration_sink_lifecycle.go +++ b/pkg/apis/sinks/v1alpha1/integration_sink_lifecycle.go @@ -132,13 +132,13 @@ func (s *IntegrationSinkStatus) PropagateDeploymentStatus(d *appsv1.Deployment) if cond.Type == appsv1.DeploymentAvailable { deploymentAvailableFound = true if cond.Status == corev1.ConditionFalse { - IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkConditionDeploymentReady, cond.Reason, cond.Message) + IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkConditionDeploymentReady, cond.Reason, "%s", cond.Message) return } } // Also check Progressing condition for failures (e.g., ImagePullBackOff, insufficient quota) if cond.Type == appsv1.DeploymentProgressing && cond.Status == corev1.ConditionFalse { - IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkConditionDeploymentReady, cond.Reason, cond.Message) + IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkConditionDeploymentReady, cond.Reason, "%s", cond.Message) return } } @@ -171,13 +171,13 @@ func (s *IntegrationSinkStatus) PropagateCertificateStatus(cs cmv1.CertificateSt if topLevel.Status == cmmeta.ConditionUnknown { IntegrationSinkCondSet.Manage(s).MarkUnknown(IntegrationSinkConditionCertificateReady, - IntegrationSinkCertificateNotReady, "Certificate is progressing, "+topLevel.Reason+" Message: "+topLevel.Message) + IntegrationSinkCertificateNotReady, "Certificate is progressing, %s Message: %s", topLevel.Reason, topLevel.Message) return false } if topLevel.Status == cmmeta.ConditionFalse { IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkConditionCertificateReady, - IntegrationSinkCertificateNotReady, "Certificate is not ready, "+topLevel.Reason+" Message: "+topLevel.Message) + IntegrationSinkCertificateNotReady, "Certificate is not ready, %s Message: %s", topLevel.Reason, topLevel.Message) return false } @@ -201,7 +201,7 @@ func (s *IntegrationSinkStatus) SetAddresses(addresses ...duckv1.Addressable) { // MarkFailedTrustBundlePropagation marks the IntegrationSink's SinkBindingTrustBundlePropagated condition to False with // the provided reason and message. func (s *IntegrationSinkStatus) MarkFailedTrustBundlePropagation(reason, message string) { - IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkTrustBundlePropagated, reason, message) + IntegrationSinkCondSet.Manage(s).MarkFalse(IntegrationSinkTrustBundlePropagated, reason, "%s", message) } // MarkTrustBundlePropagated marks the IntegrationSink's SinkBindingTrustBundlePropagated condition to True. diff --git a/pkg/apis/sources/v1/apiserver_lifecycle.go b/pkg/apis/sources/v1/apiserver_lifecycle.go index 67aac5b69c4..014671ff83f 100644 --- a/pkg/apis/sources/v1/apiserver_lifecycle.go +++ b/pkg/apis/sources/v1/apiserver_lifecycle.go @@ -112,9 +112,9 @@ func (s *ApiServerSourceStatus) PropagateDeploymentAvailability(d *appsv1.Deploy apiserverCondSet.Manage(s).MarkUnknown(ApiServerConditionDeployed, "DeploymentUpdating", "Deployment has %d unavailable replica(s).", d.Status.UnavailableReplicas) } } else if cond.Status == corev1.ConditionFalse { - apiserverCondSet.Manage(s).MarkFalse(ApiServerConditionDeployed, cond.Reason, cond.Message) + apiserverCondSet.Manage(s).MarkFalse(ApiServerConditionDeployed, cond.Reason, "%s", cond.Message) } else if cond.Status == corev1.ConditionUnknown { - apiserverCondSet.Manage(s).MarkUnknown(ApiServerConditionDeployed, cond.Reason, cond.Message) + apiserverCondSet.Manage(s).MarkUnknown(ApiServerConditionDeployed, cond.Reason, "%s", cond.Message) } } } diff --git a/pkg/apis/sources/v1/container_lifecycle.go b/pkg/apis/sources/v1/container_lifecycle.go index 79ac2aa2a34..9a09da854b3 100644 --- a/pkg/apis/sources/v1/container_lifecycle.go +++ b/pkg/apis/sources/v1/container_lifecycle.go @@ -80,11 +80,11 @@ func (s *ContainerSourceStatus) PropagateSinkBindingStatus(status *SinkBindingSt case cond.Status == corev1.ConditionTrue: containerCondSet.Manage(s).MarkTrue(ContainerSourceConditionSinkBindingReady) case cond.Status == corev1.ConditionFalse: - containerCondSet.Manage(s).MarkFalse(ContainerSourceConditionSinkBindingReady, cond.Reason, cond.Message) + containerCondSet.Manage(s).MarkFalse(ContainerSourceConditionSinkBindingReady, cond.Reason, "%s", cond.Message) case cond.Status == corev1.ConditionUnknown: - containerCondSet.Manage(s).MarkUnknown(ContainerSourceConditionSinkBindingReady, cond.Reason, cond.Message) + containerCondSet.Manage(s).MarkUnknown(ContainerSourceConditionSinkBindingReady, cond.Reason, "%s", cond.Message) default: - containerCondSet.Manage(s).MarkUnknown(ContainerSourceConditionSinkBindingReady, cond.Reason, cond.Message) + containerCondSet.Manage(s).MarkUnknown(ContainerSourceConditionSinkBindingReady, cond.Reason, "%s", cond.Message) } // Propagate SinkBindings AuthStatus to containersources AuthStatus @@ -101,9 +101,9 @@ func (s *ContainerSourceStatus) PropagateReceiveAdapterStatus(d *appsv1.Deployme if cond.Status == corev1.ConditionTrue { containerCondSet.Manage(s).MarkTrue(ContainerSourceConditionReceiveAdapterReady) } else if cond.Status == corev1.ConditionFalse { - containerCondSet.Manage(s).MarkFalse(ContainerSourceConditionReceiveAdapterReady, cond.Reason, cond.Message) + containerCondSet.Manage(s).MarkFalse(ContainerSourceConditionReceiveAdapterReady, cond.Reason, "%s", cond.Message) } else if cond.Status == corev1.ConditionUnknown { - containerCondSet.Manage(s).MarkUnknown(ContainerSourceConditionReceiveAdapterReady, cond.Reason, cond.Message) + containerCondSet.Manage(s).MarkUnknown(ContainerSourceConditionReceiveAdapterReady, cond.Reason, "%s", cond.Message) } } } diff --git a/pkg/apis/sources/v1/ping_lifecycle.go b/pkg/apis/sources/v1/ping_lifecycle.go index 7518c801181..3f6503c7da4 100644 --- a/pkg/apis/sources/v1/ping_lifecycle.go +++ b/pkg/apis/sources/v1/ping_lifecycle.go @@ -123,9 +123,9 @@ func (s *PingSourceStatus) PropagateDeploymentAvailability(d *appsv1.Deployment) PingSourceCondSet.Manage(s).MarkUnknown(PingSourceConditionDeployed, "DeploymentUpdating", "Deployment has %d unavailable replica(s).", d.Status.UnavailableReplicas) } } else if cond.Status == corev1.ConditionFalse { - PingSourceCondSet.Manage(s).MarkFalse(PingSourceConditionDeployed, cond.Reason, cond.Message) + PingSourceCondSet.Manage(s).MarkFalse(PingSourceConditionDeployed, cond.Reason, "%s", cond.Message) } else if cond.Status == corev1.ConditionUnknown { - PingSourceCondSet.Manage(s).MarkUnknown(PingSourceConditionDeployed, cond.Reason, cond.Message) + PingSourceCondSet.Manage(s).MarkUnknown(PingSourceConditionDeployed, cond.Reason, "%s", cond.Message) } } } diff --git a/pkg/apis/sources/v1/sinkbinding_lifecycle.go b/pkg/apis/sources/v1/sinkbinding_lifecycle.go index 746e7ddcdc7..4c655139075 100644 --- a/pkg/apis/sources/v1/sinkbinding_lifecycle.go +++ b/pkg/apis/sources/v1/sinkbinding_lifecycle.go @@ -88,7 +88,7 @@ func (sbs *SinkBindingStatus) InitializeConditions() { // MarkBindingUnavailable marks the SinkBinding's Ready condition to False with // the provided reason and message. func (sbs *SinkBindingStatus) MarkBindingUnavailable(reason, message string) { - sbCondSet.Manage(sbs).MarkFalse(SinkBindingConditionAvailable, reason, message) + sbCondSet.Manage(sbs).MarkFalse(SinkBindingConditionAvailable, reason, "%s", message) } // MarkBindingAvailable marks the SinkBinding's Ready condition to True. @@ -99,7 +99,7 @@ func (sbs *SinkBindingStatus) MarkBindingAvailable() { // MarkFailedTrustBundlePropagation marks the SinkBinding's SinkBindingTrustBundlePropagated condition to False with // the provided reason and message. func (sbs *SinkBindingStatus) MarkFailedTrustBundlePropagation(reason, message string) { - sbCondSet.Manage(sbs).MarkFalse(SinkBindingTrustBundlePropagated, reason, message) + sbCondSet.Manage(sbs).MarkFalse(SinkBindingTrustBundlePropagated, reason, "%s", message) } // MarkTrustBundlePropagated marks the SinkBinding's SinkBindingTrustBundlePropagated condition to True. diff --git a/pkg/apis/sources/v1alpha1/integration_lifecycle.go b/pkg/apis/sources/v1alpha1/integration_lifecycle.go index cc1270fb8b2..be79ea5cf15 100644 --- a/pkg/apis/sources/v1alpha1/integration_lifecycle.go +++ b/pkg/apis/sources/v1alpha1/integration_lifecycle.go @@ -64,11 +64,11 @@ func (s *IntegrationSourceStatus) PropagateContainerSourceStatus(status *v1.Cont case cond.Status == corev1.ConditionTrue: IntegrationCondSet.Manage(s).MarkTrue(IntegrationSourceConditionContainerSourceReady) case cond.Status == corev1.ConditionFalse: - IntegrationCondSet.Manage(s).MarkFalse(IntegrationSourceConditionContainerSourceReady, cond.Reason, cond.Message) + IntegrationCondSet.Manage(s).MarkFalse(IntegrationSourceConditionContainerSourceReady, cond.Reason, "%s", cond.Message) case cond.Status == corev1.ConditionUnknown: - IntegrationCondSet.Manage(s).MarkUnknown(IntegrationSourceConditionContainerSourceReady, cond.Reason, cond.Message) + IntegrationCondSet.Manage(s).MarkUnknown(IntegrationSourceConditionContainerSourceReady, cond.Reason, "%s", cond.Message) default: - IntegrationCondSet.Manage(s).MarkUnknown(IntegrationSourceConditionContainerSourceReady, cond.Reason, cond.Message) + IntegrationCondSet.Manage(s).MarkUnknown(IntegrationSourceConditionContainerSourceReady, cond.Reason, "%s", cond.Message) } // Propagate ContainerSources AuthStatus to IntegrationSources AuthStatus diff --git a/pkg/apis/sources/v1beta2/ping_lifecycle.go b/pkg/apis/sources/v1beta2/ping_lifecycle.go index 4ca010aa736..dc81202810e 100644 --- a/pkg/apis/sources/v1beta2/ping_lifecycle.go +++ b/pkg/apis/sources/v1beta2/ping_lifecycle.go @@ -110,9 +110,9 @@ func (s *PingSourceStatus) PropagateDeploymentAvailability(d *appsv1.Deployment) if cond.Status == corev1.ConditionTrue { PingSourceCondSet.Manage(s).MarkTrue(PingSourceConditionDeployed) } else if cond.Status == corev1.ConditionFalse { - PingSourceCondSet.Manage(s).MarkFalse(PingSourceConditionDeployed, cond.Reason, cond.Message) + PingSourceCondSet.Manage(s).MarkFalse(PingSourceConditionDeployed, cond.Reason, "%s", cond.Message) } else if cond.Status == corev1.ConditionUnknown { - PingSourceCondSet.Manage(s).MarkUnknown(PingSourceConditionDeployed, cond.Reason, cond.Message) + PingSourceCondSet.Manage(s).MarkUnknown(PingSourceConditionDeployed, cond.Reason, "%s", cond.Message) } } } diff --git a/pkg/reconciler/broker/trigger/trigger.go b/pkg/reconciler/broker/trigger/trigger.go index fe54d4233b6..1779bf6aaa8 100644 --- a/pkg/reconciler/broker/trigger/trigger.go +++ b/pkg/reconciler/broker/trigger/trigger.go @@ -398,7 +398,7 @@ func (r *Reconciler) propagateDependencyReadiness(ctx context.Context, t *eventi logging.FromContext(ctx).Infow("The ObjectMeta Generation of dependency is not equal to the observedGeneration of status", zap.Any("objectMetaGeneration", dependency.GetGeneration()), zap.Any("statusObservedGeneration", dependency.Status.ObservedGeneration)) - t.Status.MarkDependencyUnknown("GenerationNotEqual", "The dependency's metadata.generation, %q, is not equal to its status.observedGeneration, %q.", dependency.GetGeneration(), dependency.Status.ObservedGeneration) + t.Status.MarkDependencyUnknown("GenerationNotEqual", "The dependency's metadata.generation, %d, is not equal to its status.observedGeneration, %d.", dependency.GetGeneration(), dependency.Status.ObservedGeneration) return nil } t.Status.PropagateDependencyStatus(dependency) diff --git a/pkg/reconciler/broker/trigger/trigger_test.go b/pkg/reconciler/broker/trigger/trigger_test.go index 5058534d0e6..3bfcd2b2195 100644 --- a/pkg/reconciler/broker/trigger/trigger_test.go +++ b/pkg/reconciler/broker/trigger/trigger_test.go @@ -1483,7 +1483,7 @@ func TestReconcile(t *testing.T) { WithTriggerStatusSubscriberURI(subscriberURI), WithTriggerSubscriberResolvedSucceeded(), WithTriggerDeadLetterSinkNotConfigured(), - WithTriggerDependencyUnknown("GenerationNotEqual", fmt.Sprintf("The dependency's metadata.generation, %q, is not equal to its status.observedGeneration, %q.", currentGeneration, outdatedGeneration)), + WithTriggerDependencyUnknown("GenerationNotEqual", fmt.Sprintf("The dependency's metadata.generation, %d, is not equal to its status.observedGeneration, %d.", currentGeneration, outdatedGeneration)), WithTriggerOIDCIdentityCreatedSucceededBecauseOIDCFeatureDisabled()), }}, }, diff --git a/pkg/reconciler/eventpolicy/eventpolicy.go b/pkg/reconciler/eventpolicy/eventpolicy.go index 959181e1943..0a8c1c205cf 100644 --- a/pkg/reconciler/eventpolicy/eventpolicy.go +++ b/pkg/reconciler/eventpolicy/eventpolicy.go @@ -46,7 +46,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ep *v1alpha1.EventPolicy // and accordingly set the eventpolicy status subjects, err := auth.ResolveSubjects(r.authResolver, ep) if err != nil { - ep.Status.MarkSubjectsResolvedFailed("SubjectsNotResolved", err.Error()) + ep.Status.MarkSubjectsResolvedFailed("SubjectsNotResolved", "%s", err.Error()) return fmt.Errorf("failed to resolve .spec.from[].ref: %w", err) } ep.Status.MarkSubjectsResolvedSucceeded() diff --git a/pkg/reconciler/inmemorychannel/controller/inmemorychannel.go b/pkg/reconciler/inmemorychannel/controller/inmemorychannel.go index c3c1ef38167..8c9c2fcbec3 100644 --- a/pkg/reconciler/inmemorychannel/controller/inmemorychannel.go +++ b/pkg/reconciler/inmemorychannel/controller/inmemorychannel.go @@ -424,7 +424,7 @@ func (r *Reconciler) reconcileChannelService(ctx context.Context, dispatcherName expected, err := resources.NewK8sService(imc, resources.ExternalService(dispatcherNamespace, dispatcherName)) if err != nil { logging.FromContext(ctx).Error("failed to create the channel service object", zap.Error(err)) - imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", fmt.Sprint("Channel Service failed: ", err)) + imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", "Channel Service failed: %v", err) return nil, err } @@ -436,13 +436,13 @@ func (r *Reconciler) reconcileChannelService(ctx context.Context, dispatcherName svc, err = r.kubeClientSet.CoreV1().Services(imc.Namespace).Create(ctx, expected, metav1.CreateOptions{}) if err != nil { logging.FromContext(ctx).Error("failed to create the channel service", zap.Error(err)) - imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", fmt.Sprint("Channel Service failed: ", err)) + imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", "Channel Service failed: %v", err) return nil, err } return svc, nil } logging.FromContext(ctx).Error("Unable to get the channel service", zap.Error(err)) - imc.Status.MarkChannelServiceUnknown("ChannelServiceGetFailed", fmt.Sprint("Unable to get the channel service: ", err)) + imc.Status.MarkChannelServiceUnknown("ChannelServiceGetFailed", "Unable to get the channel service: %v", err) return nil, err } else if !equality.Semantic.DeepEqual(svc.Spec, expected.Spec) { svc = svc.DeepCopy() @@ -451,7 +451,7 @@ func (r *Reconciler) reconcileChannelService(ctx context.Context, dispatcherName svc, err = r.kubeClientSet.CoreV1().Services(imc.Namespace).Update(ctx, svc, metav1.UpdateOptions{}) if err != nil { logging.FromContext(ctx).Error("failed to update the channel service", zap.Error(err)) - imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", fmt.Sprint("Channel Service failed: ", err)) + imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", "Channel Service failed: %v", err) return nil, err } } @@ -459,7 +459,7 @@ func (r *Reconciler) reconcileChannelService(ctx context.Context, dispatcherName // Check to make sure that our IMC owns this service and if not, complain. if !metav1.IsControlledBy(svc, imc) { err := fmt.Errorf("inmemorychannel: %s/%s does not own Service: %q", imc.Namespace, imc.Name, svc.Name) - imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", fmt.Sprint("Channel Service failed: ", err)) + imc.Status.MarkChannelServiceFailed("ChannelServiceFailed", "Channel Service failed: %v", err) return nil, err } return svc, nil diff --git a/pkg/reconciler/parallel/parallel.go b/pkg/reconciler/parallel/parallel.go index 6aac944d3f3..9f58aff49de 100644 --- a/pkg/reconciler/parallel/parallel.go +++ b/pkg/reconciler/parallel/parallel.go @@ -110,7 +110,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, p *v1.Parallel) pkgrecon channelable, err := r.reconcileChannel(ctx, channelResourceInterface, p, channelObjRef) if err != nil { err = fmt.Errorf("failed to reconcile channel %s at step %d: %w", channelName, i, err) - p.Status.MarkChannelsNotReady("ChannelsNotReady", err.Error()) + p.Status.MarkChannelsNotReady("ChannelsNotReady", "%s", err.Error()) return err } logging.FromContext(ctx).Infof("Reconciled Channel Object: %s/%s %+v", p.Namespace, channelName, channelable) diff --git a/pkg/reconciler/sequence/sequence.go b/pkg/reconciler/sequence/sequence.go index 530d70b7166..b0570c5aa4a 100644 --- a/pkg/reconciler/sequence/sequence.go +++ b/pkg/reconciler/sequence/sequence.go @@ -104,7 +104,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, s *v1.Sequence) pkgrecon channelable, err := r.reconcileChannel(ctx, channelResourceInterface, s, channelObjRef) if err != nil { err = fmt.Errorf("failed to reconcile channel %s at step %d: %w", ingressChannelName, i, err) - s.Status.MarkChannelsNotReady("ChannelsNotReady", err.Error()) + s.Status.MarkChannelsNotReady("ChannelsNotReady", "%s", err.Error()) return err } channels = append(channels, channelable) @@ -118,7 +118,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, s *v1.Sequence) pkgrecon sub, err := r.reconcileSubscription(ctx, i, s) if err != nil { err := fmt.Errorf("failed to reconcile subscription resource for step: %d : %s", i, err) - s.Status.MarkSubscriptionsNotReady("SubscriptionsNotReady", err.Error()) + s.Status.MarkSubscriptionsNotReady("SubscriptionsNotReady", "%s", err.Error()) return err } subs = append(subs, sub) diff --git a/pkg/reconciler/testing/v1/apiserversouce.go b/pkg/reconciler/testing/v1/apiserversouce.go index 33a989b7f28..001c07f80ab 100644 --- a/pkg/reconciler/testing/v1/apiserversouce.go +++ b/pkg/reconciler/testing/v1/apiserversouce.go @@ -171,7 +171,7 @@ func WithApiServerSourceOIDCIdentityCreatedSucceededBecauseOIDCFeatureDisabled() func WithApiServerSourceOIDCIdentityCreatedFailed(reason, message string) ApiServerSourceOption { return func(c *v1.ApiServerSource) { - c.Status.MarkOIDCIdentityCreatedFailed(reason, message) + c.Status.MarkOIDCIdentityCreatedFailed(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1/broker.go b/pkg/reconciler/testing/v1/broker.go index 5c6bf8b84dc..c18529fea02 100644 --- a/pkg/reconciler/testing/v1/broker.go +++ b/pkg/reconciler/testing/v1/broker.go @@ -15,7 +15,6 @@ package testing import ( "context" - "fmt" "time" eventingv1alpha1 "knative.dev/eventing/pkg/apis/eventing/v1alpha1" @@ -129,21 +128,21 @@ func WithBrokerReadyWithDLS(b *v1.Broker) { // WithTriggerChannelFailed calls .Status.MarkTriggerChannelFailed on the Broker. func WithTriggerChannelFailed(reason, msg string) BrokerOption { return func(b *v1.Broker) { - b.Status.MarkTriggerChannelFailed(reason, msg) + b.Status.MarkTriggerChannelFailed(reason, "%s", msg) } } // WithFilterFailed calls .Status.MarkFilterFailed on the Broker. func WithFilterFailed(reason, msg string) BrokerOption { return func(b *v1.Broker) { - b.Status.MarkFilterFailed(reason, msg) + b.Status.MarkFilterFailed(reason, "%s", msg) } } // WithIngressFailed calls .Status.MarkIngressFailed on the Broker. func WithIngressFailed(reason, msg string) BrokerOption { return func(b *v1.Broker) { - b.Status.MarkIngressFailed(reason, msg) + b.Status.MarkIngressFailed(reason, "%s", msg) } } @@ -274,9 +273,8 @@ func WithDLSResolvedFailed() BrokerOption { return func(b *v1.Broker) { b.Status.MarkDeadLetterSinkResolvedFailed( "Unable to get the DeadLetterSink's URI", - fmt.Sprintf(`brokers.eventing.knative.dev "%s" not found`, - b.Spec.Delivery.DeadLetterSink.Ref.Name, - ), + `brokers.eventing.knative.dev "%s" not found`, + b.Spec.Delivery.DeadLetterSink.Ref.Name, ) } } @@ -309,7 +307,7 @@ func WithBrokerEventPoliciesReady() BrokerOption { func WithBrokerEventPoliciesNotReady(reason, message string) BrokerOption { return func(b *v1.Broker) { - b.Status.MarkEventPoliciesFailed(reason, message) + b.Status.MarkEventPoliciesFailed(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1/channel.go b/pkg/reconciler/testing/v1/channel.go index 32fedc0da4a..36a68a2b23f 100644 --- a/pkg/reconciler/testing/v1/channel.go +++ b/pkg/reconciler/testing/v1/channel.go @@ -15,7 +15,6 @@ package testing import ( "context" - "fmt" "time" "knative.dev/eventing/pkg/apis/eventing/v1alpha1" @@ -91,13 +90,13 @@ func WithChannelTemplate(typeMeta metav1.TypeMeta) ChannelOption { func WithBackingChannelFailed(reason, msg string) ChannelOption { return func(c *messagingv1.Channel) { - c.Status.MarkBackingChannelFailed(reason, msg) + c.Status.MarkBackingChannelFailed(reason, "%s", msg) } } func WithBackingChannelUnknown(reason, msg string) ChannelOption { return func(c *messagingv1.Channel) { - c.Status.MarkBackingChannelUnknown(reason, msg) + c.Status.MarkBackingChannelUnknown(reason, "%s", msg) } } @@ -169,7 +168,7 @@ func WithChannelEventPoliciesReady() ChannelOption { func WithChannelEventPoliciesNotReady(reason, message string) ChannelOption { return func(c *messagingv1.Channel) { - c.Status.MarkEventPoliciesFailed(reason, message) + c.Status.MarkEventPoliciesFailed(reason, "%s", message) } } @@ -200,9 +199,8 @@ func WithChannelDLSResolvedFailed() ChannelOption { return func(c *messagingv1.Channel) { c.Status.MarkDeadLetterSinkResolvedFailed( "Unable to get the DeadLetterSink's URI", - fmt.Sprintf(`services "%s" not found`, - c.Spec.Delivery.DeadLetterSink.Ref.Name, - ), + `services "%s" not found`, + c.Spec.Delivery.DeadLetterSink.Ref.Name, ) } } diff --git a/pkg/reconciler/testing/v1/inmemorychannel.go b/pkg/reconciler/testing/v1/inmemorychannel.go index 2647729bb15..7fa4226efed 100644 --- a/pkg/reconciler/testing/v1/inmemorychannel.go +++ b/pkg/reconciler/testing/v1/inmemorychannel.go @@ -15,7 +15,6 @@ package testing import ( "context" - "fmt" "time" "knative.dev/eventing/pkg/apis/eventing/v1alpha1" @@ -84,13 +83,13 @@ func WithInMemoryChannelSubscribers(subscribers []eventingv1.SubscriberSpec) InM func WithInMemoryChannelDeploymentFailed(reason, message string) InMemoryChannelOption { return func(imc *v1.InMemoryChannel) { - imc.Status.MarkDispatcherFailed(reason, message) + imc.Status.MarkDispatcherFailed(reason, "%s", message) } } func WithInMemoryChannelDeploymentUnknown(reason, message string) InMemoryChannelOption { return func(imc *v1.InMemoryChannel) { - imc.Status.MarkDispatcherUnknown(reason, message) + imc.Status.MarkDispatcherUnknown(reason, "%s", message) } } @@ -108,7 +107,7 @@ func WithInMemoryChannelDeploymentReady() InMemoryChannelOption { func WithInMemoryChannelServicetNotReady(reason, message string) InMemoryChannelOption { return func(imc *v1.InMemoryChannel) { - imc.Status.MarkServiceFailed(reason, message) + imc.Status.MarkServiceFailed(reason, "%s", message) } } @@ -120,7 +119,7 @@ func WithInMemoryChannelServiceReady() InMemoryChannelOption { func WithInMemoryChannelChannelServiceNotReady(reason, message string) InMemoryChannelOption { return func(imc *v1.InMemoryChannel) { - imc.Status.MarkChannelServiceFailed(reason, message) + imc.Status.MarkChannelServiceFailed(reason, "%s", message) } } @@ -132,7 +131,7 @@ func WithInMemoryChannelChannelServiceReady() InMemoryChannelOption { func WithInMemoryChannelEndpointsNotReady(reason, message string) InMemoryChannelOption { return func(imc *v1.InMemoryChannel) { - imc.Status.MarkEndpointsFailed(reason, message) + imc.Status.MarkEndpointsFailed(reason, "%s", message) } } @@ -150,7 +149,7 @@ func WithInMemoryChannelEventPoliciesReady() InMemoryChannelOption { func WithInMemoryChannelEventPoliciesNotReady(reason, message string) InMemoryChannelOption { return func(imc *v1.InMemoryChannel) { - imc.Status.MarkEventPoliciesFailed(reason, message) + imc.Status.MarkEventPoliciesFailed(reason, "%s", message) } } @@ -269,9 +268,8 @@ func WithInMemoryChannelDLSResolvedFailed() InMemoryChannelOption { return func(imc *v1.InMemoryChannel) { imc.Status.MarkDeadLetterSinkResolvedFailed( "Unable to get the DeadLetterSink's URI", - fmt.Sprintf(`failed to get object test-namespace/test-dls: services "%s" not found`, - imc.Spec.Delivery.DeadLetterSink.Ref.Name, - ), + `failed to get object test-namespace/test-dls: services "%s" not found`, + imc.Spec.Delivery.DeadLetterSink.Ref.Name, ) } } diff --git a/pkg/reconciler/testing/v1/parallel.go b/pkg/reconciler/testing/v1/parallel.go index 936faf823ce..f784c3887dc 100644 --- a/pkg/reconciler/testing/v1/parallel.go +++ b/pkg/reconciler/testing/v1/parallel.go @@ -101,19 +101,19 @@ func WithFlowsParallelIngressChannelStatus(status flowsv1.ParallelChannelStatus) func WithFlowsParallelChannelsNotReady(reason, message string) FlowsParallelOption { return func(p *flowsv1.Parallel) { - p.Status.MarkChannelsNotReady(reason, message) + p.Status.MarkChannelsNotReady(reason, "%s", message) } } func WithFlowsParallelSubscriptionsNotReady(reason, message string) FlowsParallelOption { return func(p *flowsv1.Parallel) { - p.Status.MarkSubscriptionsNotReady(reason, message) + p.Status.MarkSubscriptionsNotReady(reason, "%s", message) } } func WithFlowsParallelAddressableNotReady(reason, message string) FlowsParallelOption { return func(p *flowsv1.Parallel) { - p.Status.MarkAddressableNotReady(reason, message) + p.Status.MarkAddressableNotReady(reason, "%s", message) } } @@ -125,7 +125,7 @@ func WithFlowsParallelEventPoliciesReady() FlowsParallelOption { func WithFlowsParallelEventPoliciesNotReady(reason, message string) FlowsParallelOption { return func(p *flowsv1.Parallel) { - p.Status.MarkEventPoliciesFailed(reason, message) + p.Status.MarkEventPoliciesFailed(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1/pingsource.go b/pkg/reconciler/testing/v1/pingsource.go index 7598231a375..f00804d0462 100644 --- a/pkg/reconciler/testing/v1/pingsource.go +++ b/pkg/reconciler/testing/v1/pingsource.go @@ -125,7 +125,7 @@ func WithPingSourceOIDCIdentityCreatedSucceededBecauseOIDCFeatureDisabled() Ping func WithPingSourceOIDCIdentityCreatedFailed(reason, message string) PingSourceOption { return func(c *v1.PingSource) { - c.Status.MarkOIDCIdentityCreatedFailed(reason, message) + c.Status.MarkOIDCIdentityCreatedFailed(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1/sequence.go b/pkg/reconciler/testing/v1/sequence.go index ff8774eb1bc..52cb0b234f7 100644 --- a/pkg/reconciler/testing/v1/sequence.go +++ b/pkg/reconciler/testing/v1/sequence.go @@ -101,19 +101,19 @@ func WithSequenceChannelStatuses(channelStatuses []flowsv1.SequenceChannelStatus func WithSequenceChannelsNotReady(reason, message string) SequenceOption { return func(p *flowsv1.Sequence) { - p.Status.MarkChannelsNotReady(reason, message) + p.Status.MarkChannelsNotReady(reason, "%s", message) } } func WithSequenceSubscriptionsNotReady(reason, message string) SequenceOption { return func(p *flowsv1.Sequence) { - p.Status.MarkSubscriptionsNotReady(reason, message) + p.Status.MarkSubscriptionsNotReady(reason, "%s", message) } } func WithSequenceAddressableNotReady(reason, message string) SequenceOption { return func(p *flowsv1.Sequence) { - p.Status.MarkAddressableNotReady(reason, message) + p.Status.MarkAddressableNotReady(reason, "%s", message) } } @@ -125,7 +125,7 @@ func WithSequenceEventPoliciesReady() SequenceOption { func WithSequenceEventPoliciesNotReady(reason, message string) SequenceOption { return func(p *flowsv1.Sequence) { - p.Status.MarkEventPoliciesFailed(reason, message) + p.Status.MarkEventPoliciesFailed(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1/subscription.go b/pkg/reconciler/testing/v1/subscription.go index a3f791b44b8..89235303461 100644 --- a/pkg/reconciler/testing/v1/subscription.go +++ b/pkg/reconciler/testing/v1/subscription.go @@ -289,7 +289,7 @@ func MarkAddedToChannel(s *v1.Subscription) { func MarkNotAddedToChannel(reason, msg string) SubscriptionOption { return func(s *v1.Subscription) { - s.Status.MarkNotAddedToChannel(reason, msg) + s.Status.MarkNotAddedToChannel(reason, "%s", msg) } } @@ -299,13 +299,13 @@ func MarkReferencesResolved(s *v1.Subscription) { func WithSubscriptionReferencesNotResolved(reason, msg string) SubscriptionOption { return func(s *v1.Subscription) { - s.Status.MarkReferencesNotResolved(reason, msg) + s.Status.MarkReferencesNotResolved(reason, "%s", msg) } } func WithSubscriptionReferencesResolvedUnknown(reason, msg string) SubscriptionOption { return func(s *v1.Subscription) { - s.Status.MarkReferencesResolvedUnknown(reason, msg) + s.Status.MarkReferencesResolvedUnknown(reason, "%s", msg) } } @@ -336,7 +336,7 @@ func WithSubscriptionOIDCIdentityCreatedSucceededBecauseOIDCFeatureDisabled() Su func WithSubscriptionOIDCIdentityCreatedFailed(reason, message string) SubscriptionOption { return func(s *v1.Subscription) { - s.Status.MarkOIDCIdentityCreatedFailed(reason, message) + s.Status.MarkOIDCIdentityCreatedFailed(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1/trigger.go b/pkg/reconciler/testing/v1/trigger.go index 4e0e62a3f30..b92f24e74d7 100644 --- a/pkg/reconciler/testing/v1/trigger.go +++ b/pkg/reconciler/testing/v1/trigger.go @@ -178,7 +178,7 @@ func WithTriggerBrokerReady() TriggerOption { // WithTriggerBrokerFailed marks the Broker as failed func WithTriggerBrokerFailed(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkBrokerFailed(reason, message) + t.Status.MarkBrokerFailed(reason, "%s", message) } } @@ -192,7 +192,7 @@ func WithTriggerBrokerNotConfigured() TriggerOption { // WithTriggerBrokerUnknown marks the Broker as unknown func WithTriggerBrokerUnknown(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkBrokerUnknown(reason, message) + t.Status.MarkBrokerUnknown(reason, "%s", message) } } @@ -209,13 +209,13 @@ func WithTriggerBrokerRef(gvk metav1.GroupVersionKind, name string, namespace st func WithTriggerNotSubscribed(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkNotSubscribed(reason, message) + t.Status.MarkNotSubscribed(reason, "%s", message) } } func WithTriggerSubscribedUnknown(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkSubscribedUnknown(reason, message) + t.Status.MarkSubscribedUnknown(reason, "%s", message) } } @@ -295,13 +295,13 @@ func WithTriggerDependencyReady() TriggerOption { func WithTriggerDependencyFailed(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkDependencyFailed(reason, message) + t.Status.MarkDependencyFailed(reason, "%s", message) } } func WithTriggerDependencyUnknown(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkDependencyUnknown(reason, message) + t.Status.MarkDependencyUnknown(reason, "%s", message) } } @@ -313,7 +313,7 @@ func WithTriggerSubscriberResolvedSucceeded() TriggerOption { func WithTriggerSubscriberResolvedFailed(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkSubscriberResolvedFailed(reason, message) + t.Status.MarkSubscriberResolvedFailed(reason, "%s", message) } } @@ -331,7 +331,7 @@ func WithTriggerOIDCIdentityCreatedSucceededBecauseOIDCFeatureDisabled() Trigger func WithTriggerOIDCIdentityCreatedFailed(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkOIDCIdentityCreatedFailed(reason, message) + t.Status.MarkOIDCIdentityCreatedFailed(reason, "%s", message) } } @@ -353,7 +353,7 @@ func WithTriggerOIDCServiceAccountName(name string) TriggerOption { func WithTriggerDeadLetterSinkResolvedFailed(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkDeadLetterSinkResolvedFailed(reason, message) + t.Status.MarkDeadLetterSinkResolvedFailed(reason, "%s", message) } } @@ -377,7 +377,7 @@ func WithTriggerDeadLetterSinkNotConfigured() TriggerOption { func WithTriggerSubscriberResolvedUnknown(reason, message string) TriggerOption { return func(t *v1.Trigger) { - t.Status.MarkSubscriberResolvedUnknown(reason, message) + t.Status.MarkSubscriberResolvedUnknown(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1alpha1/eventtransform.go b/pkg/reconciler/testing/v1alpha1/eventtransform.go index eef7544d229..54bf1160d74 100644 --- a/pkg/reconciler/testing/v1alpha1/eventtransform.go +++ b/pkg/reconciler/testing/v1alpha1/eventtransform.go @@ -143,6 +143,6 @@ func WithEventTransformEventPoliciesReadyBecauseNoPolicyAndOIDCEnabled() EventTr func WithEventTransformEventPoliciesReady(reason, message string) EventTransformOption { return func(transform *eventing.EventTransform) { - transform.Status.MarkEventPoliciesTrueWithReason(reason, message) + transform.Status.MarkEventPoliciesTrueWithReason(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1alpha1/integrationsink.go b/pkg/reconciler/testing/v1alpha1/integrationsink.go index a7088033da3..3994e2751fe 100644 --- a/pkg/reconciler/testing/v1alpha1/integrationsink.go +++ b/pkg/reconciler/testing/v1alpha1/integrationsink.go @@ -101,6 +101,6 @@ func WithIntegrationSinkTrustBundlePropagatedReady() IntegrationSinkOption { func WithIntegrationSinkEventPoliciesReady(reason, message string) IntegrationSinkOption { return func(s *v1alpha1.IntegrationSink) { - s.Status.MarkEventPoliciesTrueWithReason(reason, message) + s.Status.MarkEventPoliciesTrueWithReason(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1alpha1/jobsink.go b/pkg/reconciler/testing/v1alpha1/jobsink.go index c857eabba7a..f58bce0cdd4 100644 --- a/pkg/reconciler/testing/v1alpha1/jobsink.go +++ b/pkg/reconciler/testing/v1alpha1/jobsink.go @@ -98,7 +98,7 @@ func WithJobSinkEventPoliciesReady() JobSinkOption { // WithJobSinkEventPoliciesNotReady sets the JobSink's EventPoliciesReady condition to false. func WithJobSinkEventPoliciesNotReady(reason, message string) JobSinkOption { return func(js *sinksv1alpha1.JobSink) { - js.Status.MarkEventPoliciesFailed(reason, message) + js.Status.MarkEventPoliciesFailed(reason, "%s", message) } } diff --git a/pkg/reconciler/testing/v1beta1/eventtype.go b/pkg/reconciler/testing/v1beta1/eventtype.go index 5aa5fb1bfa3..91e2a7c4e81 100644 --- a/pkg/reconciler/testing/v1beta1/eventtype.go +++ b/pkg/reconciler/testing/v1beta1/eventtype.go @@ -103,13 +103,13 @@ func WithEventTypeBrokerExists(et *v1beta1.EventType) { func WithEventTypeBrokerFailed(reason, message string) EventTypeOption { return func(et *v1beta1.EventType) { - et.Status.MarkBrokerFailed(reason, message) + et.Status.MarkBrokerFailed(reason, "%s", message) } } func WithEventTypeBrokerUnknown(reason, message string) EventTypeOption { return func(et *v1beta1.EventType) { - et.Status.MarkBrokerUnknown(reason, message) + et.Status.MarkBrokerUnknown(reason, "%s", message) } }