From fee9dc252f998c9203fbc2c5d1ac7a727f6f578e Mon Sep 17 00:00:00 2001 From: Jeff Mesnil Date: Wed, 15 Nov 2023 10:53:14 +0100 Subject: [PATCH] Update S2I images for EAP 8 GA Signed-off-by: Jeff Mesnil --- charts/eap8/Chart.yaml | 2 +- charts/eap8/README.md | 4 ++-- charts/eap8/values.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/eap8/Chart.yaml b/charts/eap8/Chart.yaml index 9b8c39b..81e518f 100644 --- a/charts/eap8/Chart.yaml +++ b/charts/eap8/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: eap8 description: Build and deploy JBoss EAP 8 applications on OpenShift type: application -version: 1.1.1 +version: 1.1.2 appVersion: "8.0" kubeVersion: ">= 1.19.0-0" home: https://www.redhat.com/en/technologies/jboss-middleware/application-platform diff --git a/charts/eap8/README.md b/charts/eap8/README.md index 3189796..1a60d97 100644 --- a/charts/eap8/README.md +++ b/charts/eap8/README.md @@ -138,8 +138,8 @@ If the application image has been built by another mechanism, you can skip the b | `build.s2i.featurePacks` | List of additional Galleon feature-packs identified by Maven coordinates (`::`) | - | 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 (`:`). 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.jdk17.builderImage` | EAP S2I Builder image for JDK 17 | `registry.redhat.io/jboss-eap-8-tech-preview/eap8-openjdk17-builder-openshift-rhel8:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.0/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/eap8-openjdk17-runtime-openshift-rhel8:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.0/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-8/eap8-openjdk17-builder-openshift-rhel8:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.0/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/eap8-openjdk17-runtime-openshift-rhel8:latest` | [EAP Documentation](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/8.0/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) | diff --git a/charts/eap8/values.yaml b/charts/eap8/values.yaml index 8f06949..03f9e38 100644 --- a/charts/eap8/values.yaml +++ b/charts/eap8/values.yaml @@ -13,8 +13,8 @@ build: kind: DockerImage jdk: "17" jdk17: - builderImage: registry.redhat.io/jboss-eap-8-tech-preview/eap8-openjdk17-builder-openshift-rhel8:latest - runtimeImage: registry.redhat.io/jboss-eap-8-tech-preview/eap8-openjdk17-runtime-openshift-rhel8:latest + builderImage: registry.redhat.io/jboss-eap-8/eap8-openjdk17-builder-openshift-rhel8:latest + runtimeImage: registry.redhat.io/jboss-eap-8/eap8-openjdk17-runtime-openshift-rhel8:latest output: kind: "ImageStreamTag" triggers: {}