This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 977081a80a386cf0b810d73848ef603b2a7f8449 Author: nicolaferraro <ni.ferr...@gmail.com> AuthorDate: Fri Oct 15 11:32:18 2021 +0200 Fix #2687: align with latest main --- pkg/controller/integration/integration_controller.go | 3 ++- pkg/platform/platform.go | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go index 239cbba..a4d6dfa 100644 --- a/pkg/controller/integration/integration_controller.go +++ b/pkg/controller/integration/integration_controller.go @@ -87,7 +87,8 @@ func add(mgr manager.Manager, c client.Client, r reconcile.Reconciler) error { // Observe the time to first readiness metric previous := old.Status.GetCondition(v1.IntegrationConditionReady) if next := it.Status.GetCondition(v1.IntegrationConditionReady); (previous == nil || previous.Status != corev1.ConditionTrue && (previous.FirstTruthyTime == nil || previous.FirstTruthyTime.IsZero())) && - next != nil && next.Status == corev1.ConditionTrue && next.FirstTruthyTime != nil && !next.FirstTruthyTime.IsZero() { + next != nil && next.Status == corev1.ConditionTrue && next.FirstTruthyTime != nil && !next.FirstTruthyTime.IsZero() && + it.Status.InitializationTimestamp != nil { duration := next.FirstTruthyTime.Time.Sub(it.Status.InitializationTimestamp.Time) Log.WithValues("request-namespace", it.Namespace, "request-name", it.Name). ForIntegration(it).Infof("First readiness after %s", duration) diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go index 78873de..8bb2a46 100644 --- a/pkg/platform/platform.go +++ b/pkg/platform/platform.go @@ -51,8 +51,6 @@ func getOrFindForResource(ctx context.Context, c k8sclient.Reader, o k8sclient.O return getOrFind(ctx, c, it.Namespace, it.Status.Platform, active, local) } else if ik, ok := o.(*v1.IntegrationKit); ok { return getOrFind(ctx, c, ik.Namespace, ik.Status.Platform, active, local) - } else if b, ok := o.(*v1.Build); ok { - return getOrFind(ctx, c, b.Namespace, b.Status.Platform, active, local) } return find(ctx, c, o.GetNamespace(), active, local) }