Skip to content

Commit

Permalink
[WFLY-17947]: todo-backend Readme OpenShift instructions results in a…
Browse files Browse the repository at this point in the history
… non-functional QS app.

* Fixing docs and pulling back composite helm charts.
* Adding workaround for WildFly 28.0.0 issue with opentelemetry
* Adding description of the openshift profile
* Removing managed server integration tests

Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
  • Loading branch information
ehsavoie committed May 15, 2023
1 parent 1ab1ff4 commit 30f70ff
Show file tree
Hide file tree
Showing 15 changed files with 413 additions and 243 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ atlassian-ide-plugin.xml
.nbattrs
*.log
build.metadata

*.lock
*.tgz
/**/nbproject/
4 changes: 4 additions & 0 deletions jaxrs-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@
<layers>
<layer>cloud-server</layer>
</layers>
<!-- Workaround to avoid opentelemetry issue that breaks the Jaxrs applications: removed once WFLY-17955 is integrated -->
<excluded-layers>
<layer>microprofile-telemetry</layer>
</excluded-layers>
<filename>ROOT.war</filename>
</configuration>
<executions>
Expand Down
4 changes: 4 additions & 0 deletions kitchensink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,10 @@
<layer>ejb</layer>
<layer>jsf</layer>
</layers>
<!-- Workaround to avoid opentelemetry issue that breaks the Jaxrs applications: removed once WFLY-17955 is integrated -->
<excluded-layers>
<layer>microprofile-telemetry</layer>
</excluded-layers>
<filename>ROOT.war</filename>
</configuration>
<executions>
Expand Down
2 changes: 2 additions & 0 deletions shared-doc/build-and-run-the-quickstart-with-openshift.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[[build_and_run_the_quickstart_on_openshift]]
= Building and running the quickstart application with OpenShift
// The openshift profile
include::../shared-doc/build-the-quickstart-for-openshift.adoc[leveloffset=+1]
// Getting Started with Helm
include::../shared-doc/helm-getting-started-overview.adoc[leveloffset=+1]
//Prepare Helm for Quickstart Deployment
Expand Down
103 changes: 103 additions & 0 deletions shared-doc/build-the-quickstart-for-openshift.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
[[build-the-quickstart-for-openshift]]
== Build the {productName} Source-to-Image (S2I) Quickstart to OpenShift with Helm Charts

On OpenShift, the S2I build with Apache Maven will use an `openshift` profile used to provision a {productName} server to deploy and run the quickstart in OpenShift environment.
You can activate the Maven profile named `openshift` when building the quickstart:

[source,subs="attributes+",options="nowrap"]
----
$ mvn clean package -Popenshift
----

The provisioned {productName} server for OpenShift, with the quickstart deployed, can then be found in the `target/server` directory, and its usage is similar to a standard server distribution. You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.

ifndef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]

ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]

ifndef::ProductRelease,EAPXPRelease[]
[source,xml,subs="attributes+"]
----
<profile>
<id>openshift</id>
<build>
<plugins>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.maven.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.cloud.fp}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
</layers>
<filename>ROOT.war</filename>
</configuration>
<executions>
<execution>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
----
endif::[]

ifdef::ProductRelease,EAPXPRelease[]
[source,xml,subs="attributes+"]
----
<profile>
<id>openshift</id>
<build>
<plugins>
<plugin>
<groupId>org.jboss.eap.plugins</groupId>
<artifactId>eap-maven-plugin</artifactId>
<version>${version.eap.maven.plugin}</version>
<configuration>
<feature-packs>
<feature-pack>
<location>org.jboss.eap:wildfly-ee-galleon-pack</location>
</feature-pack>
<feature-pack>
<location>org.jboss.eap.cloud:eap-cloud-galleon-pack</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
</layers>
<filename>ROOT.war</filename>
</configuration>
<executions>
<execution>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
----
endif::[]

[NOTE]
====
Since the plugin configuration above deploys quickstart on root web context of the provisioned server, the URL to access the application should not have the `/{artifactId}` path segment after `HOST:PORT`.
====
Loading

0 comments on commit 30f70ff

Please sign in to comment.