Error on a non-OCP semeru install w/o cert-manager (#505)

kabicin · web-flow · commit a4a9628bc712 · 2023-10-27T19:18:29.000-04:00
diff --git a/controllers/semeru_compiler.go b/controllers/semeru_compiler.go
@@ -87,7 +87,7 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruCompiler(wlva *wlv1.WebSphere
 		}
 
 		//create certmanager issuer and certificate if necessary
-		if !r.IsOpenShift() || cmPresent {
+		if cmPresent {
 			err = r.GenerateCMIssuer(wlva.Namespace, OperatorShortName, "WebSphere Liberty Operator", OperatorName)
 			if err != nil {
 				return err, "Failed to reconcile Certificate Issuer", false
@@ -96,6 +96,8 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruCompiler(wlva *wlv1.WebSphere
 			if err != nil {
 				return err, "Failed to reconcile Semeru Compiler Certificate", false
 			}
+		} else if !r.IsOpenShift() {
+			return fmt.Errorf("Could not detect a cert-manager installation. Ensure cert-manager is installed and running"), "", false
 		}
 
 		//TLS Secret

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (r ReconcileWebSphereLiberty) reconcileSemeruCompiler(wlva wlv1.WebSphere`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`//create certmanager issuer and certificate if necessary`
`90`		`- if !r.IsOpenShift() \|\| cmPresent {`
	`90`	`+ if cmPresent {`
`91`	`91`	`err = r.GenerateCMIssuer(wlva.Namespace, OperatorShortName, "WebSphere Liberty Operator", OperatorName)`
`92`	`92`	`if err != nil {`
`93`	`93`	`return err, "Failed to reconcile Certificate Issuer", false`
`@@ -96,6 +96,8 @@ func (r ReconcileWebSphereLiberty) reconcileSemeruCompiler(wlva wlv1.WebSphere`
`96`	`96`	`if err != nil {`
`97`	`97`	`return err, "Failed to reconcile Semeru Compiler Certificate", false`
`98`	`98`	`}`
	`99`	`+ } else if !r.IsOpenShift() {`
	`100`	`+ return fmt.Errorf("Could not detect a cert-manager installation. Ensure cert-manager is installed and running"), "", false`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`//TLS Secret`