From b531fe9da0cde8e4254d0df094c800f32bdf36f7 Mon Sep 17 00:00:00 2001 From: Jeff Mesnil Date: Wed, 20 Nov 2024 13:55:32 +0100 Subject: [PATCH] Initialize the eap81 Helm Chart Signed-off-by: Jeff Mesnil --- .github/workflows/validation.yaml | 6 +----- README.md | 8 ++++---- charts/{eap8 => eap81}/.helmignore | 0 charts/{eap8 => eap81}/Chart.yaml | 10 +++++----- charts/{eap8 => eap81}/README.md | 12 ++++++------ charts/{eap8 => eap81}/templates/NOTES.txt | 0 charts/{eap8 => eap81}/templates/_helpers.tpl | 0 .../templates/buildconfig-s2i-build-artifacts.yaml | 0 .../{eap8 => eap81}/templates/buildconfig-s2i.yaml | 0 charts/{eap8 => eap81}/templates/deployment.yaml | 0 charts/{eap8 => eap81}/templates/imagestream.yaml | 0 charts/{eap8 => eap81}/templates/route.yaml | 0 charts/{eap8 => eap81}/templates/service.yaml | 0 charts/{eap8 => eap81}/values.schema.json | 0 charts/{eap8 => eap81}/values.yaml | 6 +++--- examples/helloworld/README.adoc | 3 --- examples/helloworld/helm.yaml | 6 ------ 17 files changed, 19 insertions(+), 32 deletions(-) rename charts/{eap8 => eap81}/.helmignore (100%) rename charts/{eap8 => eap81}/Chart.yaml (95%) rename charts/{eap8 => eap81}/README.md (94%) rename charts/{eap8 => eap81}/templates/NOTES.txt (100%) rename charts/{eap8 => eap81}/templates/_helpers.tpl (100%) rename charts/{eap8 => eap81}/templates/buildconfig-s2i-build-artifacts.yaml (100%) rename charts/{eap8 => eap81}/templates/buildconfig-s2i.yaml (100%) rename charts/{eap8 => eap81}/templates/deployment.yaml (100%) rename charts/{eap8 => eap81}/templates/imagestream.yaml (100%) rename charts/{eap8 => eap81}/templates/route.yaml (100%) rename charts/{eap8 => eap81}/templates/service.yaml (100%) rename charts/{eap8 => eap81}/values.schema.json (100%) rename charts/{eap8 => eap81}/values.yaml (72%) delete mode 100644 examples/helloworld/README.adoc delete mode 100644 examples/helloworld/helm.yaml diff --git a/.github/workflows/validation.yaml b/.github/workflows/validation.yaml index 5e3e665..0c67dab 100644 --- a/.github/workflows/validation.yaml +++ b/.github/workflows/validation.yaml @@ -20,8 +20,4 @@ jobs: command: | shopt -s globstar echo "Check JSON schema" - cat charts/eap8/values.schema.json | jq > /dev/null - - echo "Check Yaml Examples" - shopt -s globstar - yq eval-all 'true' examples/**/*.yaml > /dev/null + cat charts/eap81/values.schema.json | jq > /dev/null \ No newline at end of file diff --git a/README.md b/README.md index 592b2ad..08e85f0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # eap-charts -Helm Charts for Red Hat JBoss Enterprise Application Platform 8 (EAP 8) +Helm Charts for Red Hat JBoss Enterprise Application Platform (EAP) 8.1 ## Install Helm Repository for WildFly Charts @@ -10,9 +10,9 @@ $ helm repo add jboss https://jbossas.github.io/eap-charts/ "jboss" has been added to your repositories $ helm search repo jboss NAME CHART VERSION APP VERSION DESCRIPTION -jboss/eap8 1.0.0-beta.0 Build and deploy EAP 8 applications on OpenShift +jboss/eap81 1.0.0-beta.0 Build and deploy EAP 8.1 applications on OpenShift ```` -## EAP8 Charts docs +## EAP 8.1 Charts docs -* A complete documentation of the `eap8` Chart is available in [charts/eap8/](./charts/eap8/README.md). +* A complete documentation of the `eap81` Chart is available in [charts/eap81/](./charts/eap81/README.md). diff --git a/charts/eap8/.helmignore b/charts/eap81/.helmignore similarity index 100% rename from charts/eap8/.helmignore rename to charts/eap81/.helmignore diff --git a/charts/eap8/Chart.yaml b/charts/eap81/Chart.yaml similarity index 95% rename from charts/eap8/Chart.yaml rename to charts/eap81/Chart.yaml index 81e518f..dae5449 100644 --- a/charts/eap8/Chart.yaml +++ b/charts/eap81/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -name: eap8 -description: Build and deploy JBoss EAP 8 applications on OpenShift +name: eap81 +description: Build and deploy JBoss EAP 8.1 applications on OpenShift type: application -version: 1.1.2 -appVersion: "8.0" +version: 1.0.0 +appVersion: "8.1" kubeVersion: ">= 1.19.0-0" home: https://www.redhat.com/en/technologies/jboss-middleware/application-platform @@ -14,7 +14,7 @@ maintainers: icon: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2Q3MWUwMDt9LmNscy0ye2ZpbGw6I2MyMWEwMDt9LmNscy0ze2ZpbGw6I2NkY2RjZDt9LmNscy00e2ZpbGw6I2I3YjdiNzt9LmNscy01e2ZpbGw6I2VhZWFlYTt9LmNscy02e2ZpbGw6I2ZmZjt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvZ288L3RpdGxlPjxnIGlkPSJMYXllcl8xIiBkYXRhLW5hbWU9IkxheWVyIDEiPjxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMC43MSA1MCkgcm90YXRlKC00NSkiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik04NS4zNiwxNC42NEE1MCw1MCwwLDAsMSwxNC42NCw4NS4zNloiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik02MC4xNyw0My4xM2EzLjQxLDMuNDEsMCwwLDEsLjA3LjY4QTMuNCwzLjQsMCwwLDAsNjAuMTcsNDMuMTNaIi8+PHBhdGggY2xhc3M9ImNscy0zIiBkPSJNNTkuMjEsNDEuMzhBMy40OCwzLjQ4LDAsMCwxLDYwLDQyLjQ3LDMuNDgsMy40OCwwLDAsMCw1OS4yMSw0MS4zOFoiLz48cG9seWdvbiBjbGFzcz0iY2xzLTMiIHBvaW50cz0iNTkuMTMgNDEuMjkgNTkuMTMgNDEuMjkgNTkuMDQgNDEuMjEgNTkuMTMgNDEuMjkiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS4xMiw0Ni4zNCwzMy41NCw2OS43M2wyNS41OC0yMy40YTMuNDUsMy40NSwwLDAsMCwuOTEtMS40QTMuNDUsMy40NSwwLDAsMSw1OS4xMiw0Ni4zNFoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yOC41NCw3MS40OCw1OC44Nyw0MSw1OC43OSw0MWEzLjcsMy43LDAsMCwwLTUuMjEuMkwyOSw2OC4yNmMtMSwxLTEuMTksMi41Mi0uMzUsMy4zMWExLjc1LDEuNzUsMCwwLDAsLjc0LjQxLDEuNzUsMS43NSwwLDAsMS0uNzQtLjQxWiIvPjxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTI4LjYyLDcxLjU3QTIuNTIsMi41MiwwLDAsMCwzMiw3MS4xMUw1OS4xMiw0Ni4zNGEzLjQyLDMuNDIsMCwwLDAsMC01TDU4Ljg3LDQxLDI4LjU0LDcxLjQ4WiIvPjxwYXRoIGNsYXNzPSJjbHMtNSIgZD0iTTM0LjQ2LDM0LjcxbC0xMC42LTguNDNhMi42LDIuNiwwLDAsMC00LjIsMi4zM2wuMTksMS42NGExOC4yMSwxOC4yMSwwLDAsMCwxMS42OSwxNWwxMy42OSw1LjE0LDIuMzEtMi41NUwzNi4xNiwzNi43M0ExNi40NSwxNi40NSwwLDAsMSwzNC40NiwzNC43MVoiLz48cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik03NC42OSw3NS40MSw2NS44OCw2NS4xMmExNi40NSwxNi40NSwwLDAsMS0yLjA4LTEuNjNMNTIuMzMsNTIuNTVsLTIuNTIsMi4zLDUuNjcsMTMuNThBMTguMjEsMTguMjEsMCwwLDAsNzAuODcsNzkuNTZsMS42NC4xM0EyLjYsMi42LDAsMCwwLDc0LjY5LDc1LjQxWiIvPjxwYXRoIGNsYXNzPSJjbHMtNSIgZD0iTTU4LjY0LDQ2Ljc4YTMsMywwLDAsMCwzLjg1LTIuMTcsMy4yOCwzLjI4LDAsMCwwLTMtNC4xNWgwbC0uNTkuNTloMGwuMjYuMjVhMy40MiwzLjQyLDAsMCwxLDAsNVoiLz48cGF0aCBjbGFzcz0iY2xzLTYiIGQ9Ik0zMi43NywxNy4xOGwtLjUsMS41M2ExNy42LDE3LjYsMCwwLDAsMy44OSwxOEw0Ny41Myw0Ny44MmwzLjYxLTQtMTMuNy0yN0EyLjU0LDIuNTQsMCwwLDAsMzIuNzcsMTcuMThaIi8+PHBhdGggY2xhc3M9ImNscy02IiBkPSJNODMuNjUsNjEuNDgsNTYuMzUsNDguODdsLTQsMy42OEw2My44LDYzLjQ5YTE3LjYsMTcuNiwwLDAsMCwxOC4xNSwzLjIzbDEuNTEtLjU1QTIuNTQsMi41NCwwLDAsMCw4My42NSw2MS40OFoiLz48cGF0aCBjbGFzcz0iY2xzLTYiIGQ9Ik01My41OCw0MS4xN2EzLjcsMy43LDAsMCwxLDUuMjEtLjJsLjA4LjA4aDBsLjU5LS41OWgwYTMuNDEsMy40MSwwLDAsMC00LjI5LTIuOTNjLTIsLjM4LTMuMDcsMi42OC0yLDQuMTFaIi8+PC9nPjwvc3ZnPg== annotations: - charts.openshift.io/name: JBoss EAP 8 + charts.openshift.io/name: JBoss EAP 8.1 charts.openshift.io/supportURL: https://access.redhat.com/support charts.openshift.io/provider: Red Hat diff --git a/charts/eap8/README.md b/charts/eap81/README.md similarity index 94% rename from charts/eap8/README.md rename to charts/eap81/README.md index 1a60d97..10c8ed4 100644 --- a/charts/eap8/README.md +++ b/charts/eap81/README.md @@ -1,6 +1,6 @@ -# Helm Chart for EAP 8 +# Helm Chart for EAP 8.1 -A Helm chart for building and deploying a [JBoss EAP 8](https://www.redhat.com/en/technologies/jboss-middleware/application-platform) application on OpenShift. +A Helm chart for building and deploying a [JBoss EAP 8.1](https://www.redhat.com/en/technologies/jboss-middleware/application-platform) application on OpenShift. ## Building and Deploying Applications @@ -124,7 +124,7 @@ If the application image has been built by another mechanism, you can skip the b | `build.enabled` | Determines if build-related resources should be created. | `true` | Set this to `false` if you want to deploy a previously built image. Leave this set to `true` if you want to build and deploy a new image. | | `build.env` | Freeform `env` items | - | [Kubernetes documentation](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/). These environment variables will be used when the application is _built_. If you need to specify environment variables for the running application, use `deploy.env` instead. | | `build.images`| Freeform images injected in the source during S2I build | - | [OKD API documentation](https://docs.okd.io/latest/rest_api/workloads_apis/buildconfig-build-openshift-io-v1.html#spec-source-images-2) | -| `build.mode` | Determines the mode to build the application image with EAP 8 | `s2i` | Allowed values: `s2i` | +| `build.mode` | Determines the mode to build the application image with EAP 8.1 | `s2i` | Allowed values: `s2i` | | `build.output.kind`| Determines if the image will be pushed to an `ImageStreamTag` or a `DockerImage` | `ImageStreamTag` | [OKD API documentation](https://docs.okd.io/latest/rest_api/workloads_apis/buildconfig-build-openshift-io-v1.html#spec-output) | | `build.output.pushSecret` | Name of the push secret | - | The secret must exist in the same namespace or the chart will fail to install - Used only if `build.output.kind` is `DockerImage` | | `build.pullSecret` | Name of the pull secret | - | The secret must exist in the same namespace or the chart will fail to install - [OKD API documentation](https://docs.okd.io/latest/rest_api/workloads_apis/buildconfig-build-openshift-io-v1.html#spec-strategy-sourcestrategy) | @@ -138,14 +138,14 @@ 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/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.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.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) | | `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 - [OKD documentation](https://docs.okd.io/latest/cicd/builds/triggering-builds-build-hooks.html) | | `build.triggers.githubSecret`| Name of the secret containing the WebHookSecretKey for the GitHub Webhook | - | The secret must exist in the same namespace or the chart will fail to install - [OKD documentation](https://docs.okd.io/latest/cicd/builds/triggering-builds-build-hooks.html) | -| `build.uri` | (**required**) Git URI that references your Git repository | https://github.com/jboss-eap-up-and-running/eap8-getting-started | Be sure to specify this to build your own application. | +| `build.uri` | (**required**) Git URI that references your Git repository | https://github.com/jboss-eap-up-and-running/eap81-getting-started | Be sure to specify this to build your own application. | ### Provisioning Jboss EAP With S2I. diff --git a/charts/eap8/templates/NOTES.txt b/charts/eap81/templates/NOTES.txt similarity index 100% rename from charts/eap8/templates/NOTES.txt rename to charts/eap81/templates/NOTES.txt diff --git a/charts/eap8/templates/_helpers.tpl b/charts/eap81/templates/_helpers.tpl similarity index 100% rename from charts/eap8/templates/_helpers.tpl rename to charts/eap81/templates/_helpers.tpl diff --git a/charts/eap8/templates/buildconfig-s2i-build-artifacts.yaml b/charts/eap81/templates/buildconfig-s2i-build-artifacts.yaml similarity index 100% rename from charts/eap8/templates/buildconfig-s2i-build-artifacts.yaml rename to charts/eap81/templates/buildconfig-s2i-build-artifacts.yaml diff --git a/charts/eap8/templates/buildconfig-s2i.yaml b/charts/eap81/templates/buildconfig-s2i.yaml similarity index 100% rename from charts/eap8/templates/buildconfig-s2i.yaml rename to charts/eap81/templates/buildconfig-s2i.yaml diff --git a/charts/eap8/templates/deployment.yaml b/charts/eap81/templates/deployment.yaml similarity index 100% rename from charts/eap8/templates/deployment.yaml rename to charts/eap81/templates/deployment.yaml diff --git a/charts/eap8/templates/imagestream.yaml b/charts/eap81/templates/imagestream.yaml similarity index 100% rename from charts/eap8/templates/imagestream.yaml rename to charts/eap81/templates/imagestream.yaml diff --git a/charts/eap8/templates/route.yaml b/charts/eap81/templates/route.yaml similarity index 100% rename from charts/eap8/templates/route.yaml rename to charts/eap81/templates/route.yaml diff --git a/charts/eap8/templates/service.yaml b/charts/eap81/templates/service.yaml similarity index 100% rename from charts/eap8/templates/service.yaml rename to charts/eap81/templates/service.yaml diff --git a/charts/eap8/values.schema.json b/charts/eap81/values.schema.json similarity index 100% rename from charts/eap8/values.schema.json rename to charts/eap81/values.schema.json diff --git a/charts/eap8/values.yaml b/charts/eap81/values.yaml similarity index 72% rename from charts/eap8/values.yaml rename to charts/eap81/values.yaml index 03f9e38..361b7b5 100644 --- a/charts/eap8/values.yaml +++ b/charts/eap81/values.yaml @@ -5,7 +5,7 @@ image: tag: latest build: - uri: https://github.com/jboss-eap-up-and-running/eap8-getting-started.git + uri: https://github.com/jboss-eap-up-and-running/eap81-getting-started.git enabled: true mode: s2i s2i: @@ -13,8 +13,8 @@ build: kind: DockerImage jdk: "17" jdk17: - 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 + 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 output: kind: "ImageStreamTag" triggers: {} diff --git a/examples/helloworld/README.adoc b/examples/helloworld/README.adoc deleted file mode 100644 index 0a08076..0000000 --- a/examples/helloworld/README.adoc +++ /dev/null @@ -1,3 +0,0 @@ -# Deploy EAP applications on OpenShift with Helm Charts - -The `helm.yaml` contains a Helm Chart that will build and deploy EAP 8's https://github.com/jboss-developer/jboss-eap-quickstarts.git[helloword] quickstart on OpenShift. diff --git a/examples/helloworld/helm.yaml b/examples/helloworld/helm.yaml deleted file mode 100644 index 27d8b57..0000000 --- a/examples/helloworld/helm.yaml +++ /dev/null @@ -1,6 +0,0 @@ -build: - uri: https://github.com/jboss-developer/jboss-eap-quickstarts.git - ref: 8.0.x - contextDir: helloworld -deploy: - replicas: 1 \ No newline at end of file