Skip to content
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

[JBEAP-24939] JDK 17 Support for XP 4 Helm Charts #60

Merged
merged 1 commit into from
Sep 28, 2023
Merged

[JBEAP-24939] JDK 17 Support for XP 4 Helm Charts #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions charts/eap-xp4/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ The configuration to build the application image is configured in a `build` sect
| `build.triggers.genericSecret`| Name of the secret containing the WebHookSecretKey for the Generic Webhook | - | The secret must exist in the same namespace or the chart will fail to install - [OpenShift documentation](https://docs.openshift.com/container-platform/latest/cicd/builds/triggering-builds-build-hooks.html#builds-webhook-triggers_triggering-builds-build-hooks) |
| `build.s2i` | Configuration specific to building with EAP S2I images | - | - |
| `build.s2i.version` | Version of the EAP S2I images | Defaults to this chart `AppVersion` | - |
| `build.s2i.jdk` | JDK Version of the EAP S2I images | `"11"` | Allowed Values: `"11"` |
| `build.s2i.jdk` | JDK Version of the EAP S2I images | `"11"` | Allowed Values: `"11"`, `"17"` |
| `build.s2i.jdk11.builderImage` | EAP S2I Builder image for JDK 11 | `registry.redhat.io/jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8` | [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) |
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be a JDK 17 equivalent?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the JDK17 equivalent images. Thanks.

| `build.s2i.jdk11.runtimeImage` | EAP S2I Runtime image for JDK 11 | `registry.redhat.io/jboss-eap-7/eap-xp4-openjdk11-runtime-openshift-rhel8` | [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.jdk17.builderImage` | EAP S2I Builder image for JDK 17 | `registry.redhat.io/jboss-eap-7/eap-xp4-openjdk17-openshift-rhel8` | [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.jdk17.runtimeImage` | EAP S2I Runtime image for JDK 17 | `registry.redhat.io/jboss-eap-7/eap-xp4-openjdk17-runtime-openshift-rhel8` | [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.galleonLayers` | A list of layer names to compose a EAP server | - | [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.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) |
Expand All @@ -106,4 +108,4 @@ The configuration to build the application image is configured in a `deploy` sec
| `deploy.volumeMounts` | Freeform `volumeMounts` items| - | [Kubernetes Documentation](https://kubernetes.io/docs/concepts/storage/volumes/) |
| `deploy.volumes` | Freeform `volumes` items| - | [Kubernetes Documentation](https://kubernetes.io/docs/concepts/storage/volumes/) |
| `deploy.initContainers` | Freeform `initContainers` items | - | [Kubernetes Documentation](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/) |
| `deploy.extraContainers` | Freeform extra `containers` items | - | [Kubernetes Documentation](https://kubernetes.io/docs/concepts/workloads/pods/#pod-templates) |
| `deploy.extraContainers` | Freeform extra `containers` items | - | [Kubernetes Documentation](https://kubernetes.io/docs/concepts/workloads/pods/#pod-templates) |
11 changes: 9 additions & 2 deletions charts/eap-xp4/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,26 @@
{{/*
eap-xp4.eapBuilderImage corresponds to the imagestream for the EAP S2I Builder image.
It depends on the build.s2i.jdkVersion.
For now, we do not need to do anything as the only support version is 11 but when we support JDK 17,
we will have to check build.s2i.jdkVersion to determin the proper image.
For now, we support versions 11 and 17.
*/}}
{{- define "eap-xp4.eapBuilderImage" -}}
{{- if eq .Values.build.s2i.jdk "11" -}}
{{ .Values.build.s2i.jdk11.builderImage}}:{{ include "eap-xp4.version" . }}
{{- else -}}
{{ .Values.build.s2i.jdk17.builderImage}}:{{ include "eap-xp4.version" . }}
{{- end -}}
{{- end -}}

{{/*
eap-xp4.eapRuntimeImage corresponds to the imagestream for the EAP S2I Runtime image.
It depends on the build.s2i.jdkVersion.
*/}}
{{- define "eap-xp4.eapRuntimeImage" -}}
{{- if eq .Values.build.s2i.jdk "11" -}}
{{ .Values.build.s2i.jdk11.runtimeImage}}:{{ include "eap-xp4.version" . }}
{{- else -}}
{{ .Values.build.s2i.jdk17.runtimeImage}}:{{ include "eap-xp4.version" . }}
{{- end -}}
{{- end -}}

{{/*
Expand Down
15 changes: 14 additions & 1 deletion charts/eap-xp4/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
"jdk": {
"description": "JDK Version of the EAP S2I images",
"type": "string",
"enum": ["11"],
"enum": ["11", "17"],
"default": "11"
},
"jdk11": {
Expand All @@ -244,6 +244,19 @@
}
}
},
"jdk17": {
"type": "object",
"properties": {
"builderImage": {
"description": "EAP S2I Builder image for JDK 17",
"type": "string"
},
"runtimeImage": {
"description": "EAP S2I Runtime image for JDK 17",
"type": "string"
}
}
},
"galleonLayers": {
"description": "List of Galleon Layers to provision",
"type": ["string", "array", "null"],
Expand Down
3 changes: 3 additions & 0 deletions charts/eap-xp4/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ build:
jdk11:
builderImage: registry.redhat.io/jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8
runtimeImage: registry.redhat.io/jboss-eap-7/eap-xp4-openjdk11-runtime-openshift-rhel8
jdk17:
builderImage: registry.redhat.io/jboss-eap-7/eap-xp4-openjdk17-openshift-rhel8
runtimeImage: registry.redhat.io/jboss-eap-7/eap-xp4-openjdk17-runtime-openshift-rhel8
output:
kind: "ImageStreamTag"
triggers: {}
Expand Down
Loading