Skip to content

fixup readme tags #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: eap81-dev
Choose a base branch
from
Open

fixup readme tags #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97bdd49
Support JDK21 images for S2I
jmesnil Nov 20, 2024
965b3cf
[JBEAP-28619] Fix startup probe
jmesnil Nov 28, 2024
62f47eb
Merge pull request #82 from jmesnil/eap81_jdk21_images
jmesnil Feb 10, 2025
15014a3
Merge pull request #89 from jmesnil/JBEAP-28619_startup_probe
jmesnil Feb 10, 2025
9b9fddf
fixup readme tags
laDok8 Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion charts/eap81/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,11 @@ If the application image has been built by another mechanism, you can skip the b
| `build.s2i.galleonDir` | Directory relative to the root directory for the build that contains custom content for Galleon. | - | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html/getting_started_with_jboss_eap_for_openshift_container_platform/index) |
| `build.s2i.featurePacks` | List of additional Galleon feature-packs identified by Maven coordinates (`<groupId>:<artifactId>:<version>`) | - | The value can be be either a `string` with a list of comma-separated Maven coordinate or an array where each item is the Maven coordinate of a feature pack - [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html/getting_started_with_jboss_eap_for_openshift_container_platform/index) |
| `build.s2i.channels` | List of Channels identified by Maven coordinates (`<groupId>:<artifactId>`). If featurePacks are configured without any versioning, the channels that provides the latest feature packs can be specified. Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml | - | The value can be be either a `string` with a list of comma-separated Maven coordinate or an array where each item is the Maven coordinate of a channel - [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html/getting_started_with_jboss_eap_for_openshift_container_platform/index) |
| `build.s2i.jdk` | JDK Version of the EAP S2I images | `"17"` | Allowed Values: `"17"` |
| `build.s2i.jdk` | JDK Version of the EAP S2I images | `"17"` | Allowed Values: `"17", "21"` |
| `build.s2i.jdk17.builderImage` | EAP S2I Builder image for JDK 17 | `registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk17-builder-openshift-rhel9:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.1/html/getting_started_with_jboss_eap_for_openshift_container_platform/index) |
| `build.s2i.jdk17.runtimeImage` | EAP S2I Runtime image for JDK 17| `registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk17-runtime-openshift-rhel9:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.1/html/getting_started_with_jboss_eap_for_openshift_container_platform/index) |
| `build.s2i.jdk21.builderImage` | EAP S2I Builder image for JDK 21 | `registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk21-builder-openshift-rhel9:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.1/html/getting_started_with_jboss_eap_for_openshift_container_platform/index) |
| `build.s2i.jdk21.runtimeImage` | EAP S2I Runtime image for JDK 21| `registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk21-runtime-openshift-rhel9:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.1/html/getting_started_with_jboss_eap_for_openshift_container_platform/index) |
| `build.s2i.kind` | Determines the type of images for S2I Builder and Runtime images (`DockerImage`, `ImageStreamTag` or `ImageStreamImage`) | `DockerImage` | [OKD Documentation](https://docs.okd.io/latest/cicd/builds/build-strategies.html#builds-strategy-s2i-build_build-strategies) |
| `build.s2i.runtimeKind` | Determines the type of images for S2I Runtime image (`DockerImage`, `ImageStreamTag` or `ImageStreamImage`) | the value of `build.s2i.kind` | [OKD Documentation](https://docs.okd.io/latest/cicd/)|
| `build.sourceSecret`|Name of the secret containing the credentials to login to Git source reposiory | - | The secret must exist in the same namespace or the chart will fail to install - [OKD documentation](https://docs.okd.io/latest/cicd/builds/creating-build-inputs.html#builds-manually-add-source-clone-secrets_creating-build-inputs) |
Expand Down
16 changes: 8 additions & 8 deletions charts/eap81/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ eap8.eapBuilderImage corresponds to the imagestream for the EAP S2I Builder imag
It depends on the build.s2i.jdk version.
*/}}
{{- define "eap8.eapBuilderImage" -}}
{{- if eq .Values.build.s2i.jdk "11" -}}
{{ .Values.build.s2i.jdk11.builderImage}}
{{- else -}}
{{- if eq .Values.build.s2i.jdk "17" -}}
{{ .Values.build.s2i.jdk17.builderImage}}
{{- else -}}
{{ .Values.build.s2i.jdk21.builderImage}}
{{- end -}}
{{- end -}}

Expand All @@ -16,10 +16,10 @@ eap8.eapRuntimeImage corresponds to the imagestream for the EAP S2I Runtime imag
It depends on the build.s2i.jdkVersion.
*/}}
{{- define "eap8.eapRuntimeImage" -}}
{{- if eq .Values.build.s2i.jdk "11" -}}
{{ .Values.build.s2i.jdk11.runtimeImage}}
{{- else -}}
{{- if eq .Values.build.s2i.jdk "17" -}}
{{ .Values.build.s2i.jdk17.runtimeImage}}
{{- else -}}
{{ .Values.build.s2i.jdk21.runtimeImage}}
{{- end -}}
{{- end -}}

Expand All @@ -40,9 +40,9 @@ app.openshift.io/runtime: eap
{{- define "eap8.metering.labels" -}}
com.company: "Red_Hat"
rht.prod_name: "Red_Hat_Runtimes"
rht.prod_ver: "2023-Q4"
rht.prod_ver: "2025-Q2"
rht.comp: "EAP"
rht.comp_ver: "8.0"
rht.comp_ver: "8.1"
rht.subcomp_t: "application"
{{- end }}

Expand Down
20 changes: 17 additions & 3 deletions charts/eap81/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
"jdk": {
"description": "JDK Version of the EAP S2I images",
"type": "string",
"enum": ["17"],
"enum": ["17", "21"],
"default": "17"
},
"jdk17": {
Expand All @@ -248,9 +248,23 @@
"runtimeImage": {
"description": "EAP S2I Runtime image for JDK 17",
"type": "string"
}
}
},
}
},
"jdk21": {
"description": "EAP S2I images for JDK 21",
"type": "object",
"properties": {
"builderImage": {
"description": "EAP S2I Builder image for JDK 21",
"type": "string"
},
"runtimeImage": {
"description": "EAP S2I Runtime image for JDK 21",
"type": "string"
}
}
},
"buildApplicationImage": {
"description": "Determine if the application image must be built. If false, the Helm release will build the first artifact image (with the name of the Helm release)",
"type": "boolean",
Expand Down
9 changes: 6 additions & 3 deletions charts/eap81/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ build:
jdk17:
builderImage: registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk17-builder-openshift-rhel9:latest
runtimeImage: registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk17-runtime-openshift-rhel9:latest
jdk21:
builderImage: registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk21-builder-openshift-rhel9:latest
runtimeImage: registry.redhat.io/jboss-eap-8-tech-preview/eap81-openjdk21-runtime-openshift-rhel9:latest
output:
kind: "ImageStreamTag"
triggers: {}
Expand All @@ -32,14 +35,14 @@ deploy:
httpGet:
path: /health/live
port: admin
initialDelaySeconds: 60
readinessProbe:
httpGet:
path: /health/ready
port: admin
initialDelaySeconds: 10
startupProbe:
httpGet:
path: /health/live
path: /health/started
port: admin
initialDelaySeconds: 60
initialDelaySeconds: 10
failureThreshold: 11
2 changes: 1 addition & 1 deletion examples/eap81/getting-started/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:icons: font
:idprefix:
:idseparator: -
:keywords: openshift,wildfly,microprofile,helm
:keywords: openshift,wildfly,helm

This example shows how to deploy a Java application with EAP 8.1 on OpenShift.

Expand Down
Loading