Make bad resource failures terminal

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

pkg/controller/install/deployment.go

@@ -206,6 +206,10 @@ func (i *StrategyDeploymentInstaller) Install(s Strategy) error {
 		if apierrors.IsForbidden(err) {
 			return StrategyError{Reason: StrategyErrInsufficientPermissions, Message: fmt.Sprintf("install strategy failed: %s", err)}
 		}
+		if apierrors.IsInvalid(err) || apierrors.IsBadRequest(err) {
+			return StrategyError{Reason: StrategyErrBadResource, Message: fmt.Sprintf("%s", err)}
+		}
+		log.Debugf("[debug] failed to install strategy %s: %v", strategy.GetStrategyName(), err)
 		return err
 	}
 

pkg/controller/install/errors.go

@@ -10,6 +10,7 @@ const (
 	StrategyErrBadPatch                 = "PatchUnsuccessful"
 	StrategyErrDeploymentUpdated        = "DeploymentUpdated"
 	StrategyErrInsufficientPermissions  = "InsufficentPermissions"
+	StrategyErrBadResource              = "BadResource"
 )
 
 // unrecoverableErrors are the set of errors that mean we can't recover an install strategy
@@ -18,6 +19,7 @@ var unrecoverableErrors = map[string]struct{}{
 	StrategyErrReasonTimeout:           {},
 	StrategyErrBadPatch:                {},
 	StrategyErrInsufficientPermissions: {},
+	StrategyErrBadResource:             {},
 }
 
 // StrategyError is used to represent error types for install strategies

pkg/controller/operators/olm/operator.go

@@ -2215,6 +2215,9 @@ func (a *Operator) transitionCSVState(in v1alpha1.ClusterServiceVersion) (out *v
 		}
 
 		if syncError = installer.Install(strategy); syncError != nil {
+			logger.Debugf("debugmark %v", syncError)
+			logger.Debugf("debugmark %#v", syncError)
+			logger.Debugf("debugmark %+v", syncError)
 			if install.IsErrorUnrecoverable(syncError) {
 				logger.Infof("Setting CSV reason to failed without retry: %v", syncError)
 				out.SetPhaseWithEvent(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonComponentFailedNoRetry, fmt.Sprintf("install strategy failed: %s", syncError), now, a.recorder)