Merge pull request #16287 from jim-minter/ti_timeout

Automatic merge from submit-queue (batch tested with PRs 15927, 16283, 16239, 16271, 16287)

ignore API server timeout errors in templateinstance controller readiness checking

Saw this issue in https://bugzilla.redhat.com/show_bug.cgi?id=1489748

Author: openshift-merge-robot

Diff for: pkg/template/controller/templateinstance_controller.go

@@ -157,7 +157,9 @@ func (c *TemplateInstanceController) sync(key string) error {
 
 	if !templateInstance.HasCondition(templateapi.TemplateInstanceInstantiateFailure, kapi.ConditionTrue) {
 		ready, err := c.checkReadiness(templateInstance, time.Now())
-		if err != nil {
+		if err != nil && !kerrors.IsTimeout(err) {
+			// NB: kerrors.IsTimeout() is true in the case of an API server
+			// timeout, not the timeout caused by readinessTimeout expiring.
 			glog.V(4).Infof("TemplateInstance controller: checkReadiness %s returned %v", key, err)
 
 			templateInstance.SetCondition(templateapi.TemplateInstanceCondition{