Skip to content

Commit

Permalink
Cover separate management interface deployed by openshift-extension
Browse files Browse the repository at this point in the history
Follow-up to 2b483fa
Apps with separate management interface can now be deployed
by quarkus openshift-extension

Test plans for the change: https://github.com/quarkus-qe/quarkus-test-plans/blob/main/QUARKUS-2738.md
Related links:
    quarkusio/quarkus#30506
    https://issues.redhat.com/browse/QUARKUS-2738
  • Loading branch information
fedinskiy committed Apr 18, 2023
1 parent fb89782 commit 4e153a0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;

import org.apache.http.HttpStatus;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import io.quarkus.test.bootstrap.RestService;
Expand All @@ -13,7 +12,6 @@
import io.restassured.response.Response;

@OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension)
@Disabled("Requires fixing https://github.com/quarkusio/quarkus/issues/32135 and changes in the Framework")
public class OpenShiftExtensionIT {
@QuarkusApplication
static final RestService app = new RestService();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@ public class OpenShiftCustomMetricsIT {
@QuarkusApplication
static RestService app = new RestService()
/*
* TODO fix deployment with OpenShiftDeploymentStrategies in the Framework
* see https://github.com/quarkusio/quarkus/issues/32135#issuecomment-1486740862 for details
* .withProperty("quarkus.management.ssl.certificate.key-store-file",
* "META-INF/resources/server.keystore")
* TODO use https when https://github.com/quarkusio/quarkus/issues/32225 is fixed
* .withProperty("quarkus.management.ssl.certificate.key-store-file", "META-INF/resources/server.keystore")
* .withProperty("quarkus.management.ssl.certificate.key-store-password", "password")
* .withProperty("quarkus.management.enabled", "true")
*/
.withProperty("quarkus.management.enabled", "true")
.onPostStart(OpenShiftCustomMetricsIT::loadServiceMonitor);

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ metadata:
spec:
endpoints:
- interval: 30s
targetPort: 8080
targetPort: 9000
path: /q/metrics
scheme: http
selector:
matchLabels:
# Configured in application.properties: quarkus.openshift.labels.app-with-metrics
app-with-metrics: 'quarkus-app'
app-with-metrics: 'quarkus-app'
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
<quarkus.qe.framework.version>1.3.0.Beta11</quarkus.qe.framework.version>
<quarkus.qe.framework.version>1.3.0.Beta13</quarkus.qe.framework.version>
<quarkus-qpid-jms.version>0.42.0</quarkus-qpid-jms.version>
<quarkus-ide-config.version>2.12.1.Final</quarkus-ide-config.version>
<apache-httpclient-fluent.version>4.5.14</apache-httpclient-fluent.version>
Expand Down

0 comments on commit 4e153a0

Please sign in to comment.