Merge pull request #2224 from anik120/registry-liveness-probe

openshift-merge-robot · web-flow · commit a4d4ab60bc28 · 2021-06-29T13:16:08.000-04:00
(fix)registry: fix configmap registry server liveness probe timeouts
diff --git a/pkg/controller/registry/reconciler/configmap.go b/pkg/controller/registry/reconciler/configmap.go
@@ -101,7 +101,7 @@ func (s *configMapCatalogSourceDecorator) Service() *v1.Service {
 }
 
 func (s *configMapCatalogSourceDecorator) Pod(image string) *v1.Pod {
-	pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 2)
+	pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 5)
 	pod.Spec.ServiceAccountName = s.GetName() + ConfigMapServerPostfix
 	pod.Spec.Containers[0].Command = []string{"configmap-server", "-c", s.Spec.ConfigMap, "-n", s.GetNamespace()}
 	ownerutil.AddOwner(pod, s.CatalogSource, false, false)
diff --git a/pkg/controller/registry/reconciler/reconciler.go b/pkg/controller/registry/reconciler/reconciler.go
@@ -139,6 +139,7 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, saName strin
 							},
 						},
 						InitialDelaySeconds: livenessDelay,
+						TimeoutSeconds:      5,
 					},
 					Resources: v1.ResourceRequirements{
 						Requests: v1.ResourceList{

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (s configMapCatalogSourceDecorator) Service() v1.Service {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func (s configMapCatalogSourceDecorator) Pod(image string) v1.Pod {`
`104`		`- pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 2)`
	`104`	`+ pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 5)`
`105`	`105`	`pod.Spec.ServiceAccountName = s.GetName() + ConfigMapServerPostfix`
`106`	`106`	`pod.Spec.Containers[0].Command = []string{"configmap-server", "-c", s.Spec.ConfigMap, "-n", s.GetNamespace()}`
`107`	`107`	`ownerutil.AddOwner(pod, s.CatalogSource, false, false)`