From 8c0d84e4cb3a95b24971c36ad9e7a3d8c5f0dcb9 Mon Sep 17 00:00:00 2001 From: dtfranz Date: Tue, 14 Feb 2023 17:14:40 -0800 Subject: [PATCH] Catalog Pod Startup Probe Timeout Updates the Startup Probe timeoutSeconds for catalog pods to be consistent with the timeouts in the readiness and liveness probes. Also adjusted the failure threshold in order to maintain the ~150s startup time failure as originally designed. Upstream-repository: operator-lifecycle-manager Upstream-commit: 401bfff4df20c97bef08db2dc9fc75bc1879be7a Signed-off-by: dtfranz --- .../pkg/controller/registry/reconciler/reconciler.go | 3 ++- .../pkg/controller/registry/reconciler/reconciler.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go b/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go index 1d61d47d13..ebcbd86849 100644 --- a/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go +++ b/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go @@ -162,8 +162,9 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name string, img string, saNam Command: []string{"grpc_health_probe", "-addr=:50051"}, }, }, - FailureThreshold: 15, + FailureThreshold: 10, PeriodSeconds: 10, + TimeoutSeconds: 5, }, Resources: corev1.ResourceRequirements{ Requests: corev1.ResourceList{ diff --git a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go index 1d61d47d13..ebcbd86849 100644 --- a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go +++ b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go @@ -162,8 +162,9 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name string, img string, saNam Command: []string{"grpc_health_probe", "-addr=:50051"}, }, }, - FailureThreshold: 15, + FailureThreshold: 10, PeriodSeconds: 10, + TimeoutSeconds: 5, }, Resources: corev1.ResourceRequirements{ Requests: corev1.ResourceList{