Merge pull request #1268 from kramvan1/fix-1238-configmap-probes

openshift-merge-robot · web-flow · commit 8e442f2c361f · 2020-02-04T22:18:28.000-08:00
Bug 1768819: Fix configmap registry server readiness probe timeouts
diff --git a/pkg/controller/registry/reconciler/configmap.go b/pkg/controller/registry/reconciler/configmap.go
@@ -89,7 +89,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(), 1, 2)
+	pod := Pod(s.CatalogSource, "configmap-registry-server", image, s.Labels(), 5, 2)
 	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
@@ -118,6 +118,7 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, labels map[s
 							},
 						},
 						InitialDelaySeconds: readinessDelay,
+						TimeoutSeconds: 5,
 					},
 					LivenessProbe: &v1.Probe{
 						Handler: v1.Handler{

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (s configMapCatalogSourceDecorator) Service() v1.Service {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`func (s configMapCatalogSourceDecorator) Pod(image string) v1.Pod {`
`92`		`- pod := Pod(s.CatalogSource, "configmap-registry-server", image, s.Labels(), 1, 2)`
	`92`	`+ pod := Pod(s.CatalogSource, "configmap-registry-server", image, s.Labels(), 5, 2)`
`93`	`93`	`pod.Spec.ServiceAccountName = s.GetName() + ConfigMapServerPostfix`
`94`	`94`	`pod.Spec.Containers[0].Command = []string{"configmap-server", "-c", s.Spec.ConfigMap, "-n", s.GetNamespace()}`
`95`	`95`	`ownerutil.AddOwner(pod, s.CatalogSource, false, false)`