Various fixes

Signed-off-by: Jeff Mesnil <[email protected]>
jbossas · Mar 4, 2024 · faf9baf · faf9baf
1 parent b6225ab
commit faf9baf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/charts/eap-xp5/README.md b/charts/eap-xp5/README.md
@@ -150,12 +150,12 @@ If the application image has been built by another mechanism, you can skip the b
 
 ### Provisioning Jboss EAP With S2I.
 
-The recommended way to provision the JBoss EAP server is to use the `eap-maven-plugin` from the application `pom.xml`.
+The recommended way to provision the JBoss EAP XP5 server is to use the `eap-maven-plugin` from the application `pom.xml`.
 
 The `build.s2i.featurePacks`,`build.s2i.galleonLayers`and `build.s2i.channels` fields have been deprecated as they are no longer necessary with this recommendation.
 
 For backwards compatibility, the EAP S2I Builder image still supports these fields to delegate to the provisioning of the server to the `eap-maven-plugin` if it is not configured in the application `pom.xml`.
-However if `build.s2i.galleonLayers` is set, `build.s2i.featurePacks` _must_ be specified (including EAP own feature pack `org.jboss.eap:wildfly-ee-galleon-pack`).
+However if `build.s2i.galleonLayers` is set, `build.s2i.featurePacks` _must_ be specified (including EAP XP5 feature pack `org.jboss.eap.xp:wildfly-galleon-pack`).
 
 ## Deploying the Application Image
 

diff --git a/charts/eap-xp5/templates/_helpers.tpl b/charts/eap-xp5/templates/_helpers.tpl
@@ -4,24 +4,16 @@ eap-xp5.eapBuilderImage corresponds to the imagestream for the EAP S2I Builder i
 It depends on the build.s2i.jdk version.
 */}}
 {{- define "eap-xp5.eapBuilderImage" -}}
-{{- if eq .Values.build.s2i.jdk "11"  -}}
-{{ .Values.build.s2i.jdk11.builderImage}}
-{{- else -}}
 {{ .Values.build.s2i.jdk17.builderImage}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 eap-xp5.eapRuntimeImage corresponds to the imagestream for the EAP S2I Runtime image.
 It depends on the build.s2i.jdkVersion.
 */}}
 {{- define "eap-xp5.eapRuntimeImage" -}}
-{{- if eq .Values.build.s2i.jdk "11"  -}}
-{{ .Values.build.s2i.jdk11.runtimeImage}}
-{{- else -}}
 {{ .Values.build.s2i.jdk17.runtimeImage}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Create chart name and version as used by the chart label.

diff --git a/examples/eap-xp5/microprofile-config/README.adoc b/examples/eap-xp5/microprofile-config/README.adoc
@@ -5,7 +5,7 @@
 :idseparator:       -
 :keywords:          openshift,wildfly,microprofile,helm
 
-This example shows how to deploy an Eclipse MicroProfile application with EAP XP 54 on OpenShift.
+This example shows how to deploy an Eclipse MicroProfile application with EAP XP 5 on OpenShift.
 
 ## Prerequisites
 
@@ -20,7 +20,7 @@ This environment variable is specified in the `deploy.env` section of the Helm C
 
 ## Installation
 
-The application can be built with Bootable Jar or using WildFly S2I images.
+The application can be built with Bootable Jar or using EAP 8.0 S2I images.
 
 ### Installation with Bootable Jar