Skip to content

Commit

Permalink
Merge pull request #57 from tommaso-borgato/issues-37
Browse files Browse the repository at this point in the history 
Fix #37
  • Loading branch information
@fabiobrz
fabiobrz authored Jun 9, 2023
2 parents 16ea385 + 85b22d6 commit d5670c8
Show file tree
Hide file tree
Showing 16 changed files with 6,292 additions and 13 deletions.
19 changes: 10 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,16 @@ public class PostgresqlProvisionTest {

Mapping of implemented provisioners:

| Product | Application | Provisioner | Notes |
|:-----------|:-------------------------------------|:-------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| ActiveMQ | ActiveMQOperatorApplication* | ActiveMQOperatorProvisioner | |
| Kafka | KafkaOperatorApplication | KafkaOperatorProvisioner | |
| Wildfly | WildflyImageOpenShiftApplication | WildflyImageOpenShiftProvisioner | Available both for Git sources and binary based s2i v2 build (either a pre-built deployment or a filesystem resource like a Maven project folder) |
| Wildfly | WildflyHelmChartOpenShiftApplication | WildflyHelmChartOpenShiftProvisioner | The `wildfly-2.3.2` tag of https://github.com/wildfly/wildfly-charts is used and the model is generated based on the https://raw.githubusercontent.com/wildfly/wildfly-charts/main/charts/wildfly/values.schema.json value schema file | |
| Infinispan | InfinispanOperatorApplication | InfinispanOperatorProvisioner | |
| Keycloak | KeycloakOpenShiftApplication | KeycloakTemplateOpenShiftProvisioner | |
| Keycloak | KeycloakOperatorApplication | KeycloakOperatorProvisioner | |
| Product | Application | Provisioner | Notes |
|:-----------|:-------------------------------------|:-------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| ActiveMQ | ActiveMQOperatorApplication* | ActiveMQOperatorProvisioner | |
| Kafka | KafkaOperatorApplication | KafkaOperatorProvisioner | |
| Wildfly | WildflyImageOpenShiftApplication | WildflyImageOpenShiftProvisioner | Available both for Git sources and binary based s2i v2 build (either a pre-built deployment or a filesystem resource like a Maven project folder) |
| Wildfly | WildflyHelmChartOpenShiftApplication | WildflyHelmChartOpenShiftProvisioner | The `wildfly-2.3.2` tag of https://github.com/wildfly/wildfly-charts is used and the model is generated based on the https://raw.githubusercontent.com/wildfly/wildfly-charts/main/charts/wildfly/values.schema.json value schema file | |
| Infinispan | InfinispanOperatorApplication | InfinispanOperatorProvisioner | |
| Keycloak | KeycloakOpenShiftApplication | KeycloakTemplateOpenShiftProvisioner | |
| Keycloak | KeycloakOperatorApplication | KeycloakOperatorProvisioner | |
| Keycloak | KeycloakRealmImportOperatorApplication | KeycloakRealmImportOperatorProvisioner | The latest Quarkus based Keycloak Operator, doesn't provide stable CRDs yet (see https://www.keycloak.org/2022/09/operator-crs); this operator offers a temporary solution which supports the `Keycloak` and `KeycloakRealmImport` Custom Resources: these are the only supported CR at the time of writing |

Additional services provisioners:

Expand Down
6 changes: 6 additions & 0 deletions global-test.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ intersmash.kafka.operators.channel=strimzi-0.29.x
# DB
intersmash.mysql.image=quay.io/centos7/mysql-80-centos7
intersmash.postgresql.image=quay.io/centos7/postgresql-13-centos7

# Keycloak (new Quarkus based version) settings
#intersmash.keycloak.realm_import.image=quay.io/keycloak/keycloak:21.1.1
#intersmash.keycloak.realm_import.operators.catalog_source=community-operators
#intersmash.keycloak.realm_import.operators.index_image=registry.redhat.io/redhat/community-operator-index:v4.12
#intersmash.keycloak.realm_import.operators.channel=fast
17 changes: 16 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
<formatting-style-base-directory>${project.basedir}/ide-config</formatting-style-base-directory>
<formatting-style-file>eclipse-format.xml</formatting-style-file>

<xtf.version>0.29</xtf.version>
<!--
Using XTF snapshot in order to include fixes in:
https://github.com/xtf-cz/xtf/commit/a833c545082b314db538ed0c73e93310752654f7
https://github.com/xtf-cz/xtf/commit/0ed7dc16c88087ce9073a447311be6c01a520f8a
-->
<xtf.version>0.31-202305291230-SNAPSHOT</xtf.version>

<version.junit.jupiter>5.7.0</version.junit.jupiter>

Expand All @@ -37,6 +42,7 @@
<version.io.strimzi-api>0.28.0</version.io.strimzi-api>
<version.com.fasterxml.jackson>2.13.1</version.com.fasterxml.jackson>
<version.io.fabric8>6.6.0</version.io.fabric8>
<version.openshift-client>5.12.2</version.openshift-client>

<!--
Version used for the activemq-artemis-operator;
Expand Down Expand Up @@ -285,6 +291,10 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-model-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- The following ones are used by the generated code for the Hyperfoil APIs -->
Expand Down Expand Up @@ -339,6 +349,11 @@
<artifactId>generator-annotations</artifactId>
<version>${version.io.fabric8}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>openshift-client</artifactId>
<version>${version.openshift-client}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
4 changes: 4 additions & 0 deletions testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
<groupId>org.jboss.intersmash</groupId>
<artifactId>intersmash-deployments-provider</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>openshift-client</artifactId>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit d5670c8

Please sign in to comment.