Skip to content

Commit f62ff7b

Browse files
committed
Bug 1977479: fix configmap registry server liveness probe timeouts
Failing readiness/liveness probe fires prometheus alerts for CatalogSources backed by configmap registry servers. In #1378, the readiness probe initial delay and timeout were bumped to account for node resource constraints during pod startup. This PR bumps the liveness probe delay and timeout values too, to account for scenarios where node resources continue to be overloaded causing the liveness probe to fail temporarily. Signed-off-by: Anik Bhattacharjee <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 33b957dee280ecfe18097723be1a0eb016c00410
1 parent 4628ec7 commit f62ff7b

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (s *configMapCatalogSourceDecorator) Service() *v1.Service {
100100
}
101101

102102
func (s *configMapCatalogSourceDecorator) Pod(image string) *v1.Pod {
103-
pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 2)
103+
pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 5)
104104
pod.Spec.ServiceAccountName = s.GetName() + ConfigMapServerPostfix
105105
pod.Spec.Containers[0].Command = []string{"configmap-server", "-c", s.Spec.ConfigMap, "-n", s.GetNamespace()}
106106
ownerutil.AddOwner(pod, s.CatalogSource, false, false)

staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, saName strin
139139
},
140140
},
141141
InitialDelaySeconds: livenessDelay,
142+
TimeoutSeconds: 5,
142143
},
143144
Resources: v1.ResourceRequirements{
144145
Requests: v1.ResourceList{

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)