Merge pull request #86 from entando-k8s/ENG-4776_Porting-the-operator…

…-capability-to-select-the-tomcat-image-for-entando-de-app-to-Entando-7.1.X ENG-4776 Porting the operator capability to select the tomcat image for entando-de-app to Entando 7.1.X
entando-k8s · Apr 19, 2023 · c30e7ca · c30e7ca
2 parents 74bb9c8 + f3d8133
commit c30e7ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
         <version>7.1.0</version>
         <relativePath/>
     </parent>
-    <version>7.1.3</version>
+    <version>7.1.6</version>
     <artifactId>entando-k8s-app-controller</artifactId>
     <name>Entando K8S Controller for Entando App Deployments</name>
     <description>Entando's K8S Controller for Entando App Deployments</description>

diff --git a/src/main/java/org/entando/kubernetes/controller/app/EntandoAppDeployableContainer.java b/src/main/java/org/entando/kubernetes/controller/app/EntandoAppDeployableContainer.java
@@ -105,11 +105,13 @@ public String determineImageToUse() {
     }
 
     private JeeServer determineStandardImage() {
-        if (EntandoOperatorSpiConfig.getComplianceMode() == EntandoOperatorComplianceMode.REDHAT) {
-            return JeeServer.EAP;
-        } else {
-            return entandoApp.getSpec().getStandardServerImage().orElse(JeeServer.WILDFLY);
-        }
+        return entandoApp.getSpec().getStandardServerImage().orElseGet(() -> {
+            if (EntandoOperatorSpiConfig.getComplianceMode() == EntandoOperatorComplianceMode.REDHAT) {
+                return JeeServer.EAP;
+            } else {
+                return JeeServer.TOMCAT;
+            }
+        });
     }
 
     @Override