Skip to content

Commit f45472b

Browse files
author
pablo gonzalez granados
committed
Moves 007-openshift-yaml-health-probes to 020-quarkus-http-non-application-endpoints.
1 parent d7cbfb9 commit f45472b

File tree

9 files changed

+29
-75
lines changed

9 files changed

+29
-75
lines changed
+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# Quarkus - OpenShift extension
1+
# Quarkus - OpenShift extension ([Moved to 020-quarkus-all-extensions](../020-quarkus-http-non-application-endpoints))
22
By adding *quarkus-openshift* extension, maven build creates */kubernetes* directory under the */target*
33
which includes *.yml* files for deployment
44

55
### Test goal
66
The goal of the test is to ensure that *kubernetes.yml* file has been created
7-
under mentioned */kubernetes* directory and parse that file to see required fields are present.
7+
under mentioned */kubernetes* directory and parse that file to see required fields are present.
8+

007-openshift-yaml-health-probes/pom.xml

-51
This file was deleted.

007-openshift-yaml-health-probes/src/main/java/io/quarkus/qe/openshift/GreetingResource.java

-16
This file was deleted.

007-openshift-yaml-health-probes/src/main/resources/application.properties

-1
This file was deleted.

020-quarkus-http-non-application-endpoints/README.md

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# Scenario 020: Quarkus http non-application endpoints
1+
# Table of Contents
2+
1. [Quarkus http non-application endpoints](#Quarkus-http-non-application-endpoints)
3+
2. [Quarkus - OpenShift extension](#Quarkus-openshift-extension)
4+
5+
## Quarkus http non-application endpoints
26

37
We have covered the following non-application endpoints:
48

@@ -67,4 +71,12 @@ quarkus.http.non-application-root-path=/q
6771
quarkus.http.redirect-to-non-application-root-path=true
6872
```
6973

70-
Valid request example: `http://localhost:8080/api/health`, will be redirected to `http://localhost:8080/q/health`
74+
Valid request example: `http://localhost:8080/api/health`, will be redirected to `http://localhost:8080/q/health`
75+
76+
## Quarkus OpenShift extension
77+
By adding *quarkus-openshift* extension, maven build creates */kubernetes* directory under the */target*
78+
which includes *.yml* files for deployment
79+
80+
### Test goal
81+
The goal of the test is to ensure that *kubernetes.yml* file has been created
82+
under mentioned */kubernetes* directory and parse that file to see required fields are present.

020-quarkus-http-non-application-endpoints/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<groupId>io.quarkus</groupId>
3434
<artifactId>quarkus-smallrye-openapi</artifactId>
3535
</dependency>
36+
<dependency>
37+
<groupId>io.quarkus</groupId>
38+
<artifactId>quarkus-openshift</artifactId>
39+
</dependency>
3640

3741
<dependency>
3842
<groupId>io.quarkus</groupId>
@@ -44,5 +48,10 @@
4448
<artifactId>rest-assured</artifactId>
4549
<scope>test</scope>
4650
</dependency>
51+
<dependency>
52+
<groupId>org.yaml</groupId>
53+
<artifactId>snakeyaml</artifactId>
54+
<scope>test</scope>
55+
</dependency>
4756
</dependencies>
4857
</project>

020-quarkus-http-non-application-endpoints/src/main/resources/application.properties

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
quarkus.container-image.name=demo
12
quarkus.application.name=non-application endpoints
23
quarkus.http.root-path=/api
34
quarkus.http.non-application-root-path=/q

007-openshift-yaml-health-probes/src/test/java/io/quarkus/qe/openshift/OpenShiftYamlHealthProbesIT.java 020-quarkus-http-non-application-endpoints/src/test/java/io/quarkus/qe/openshift/OpenShiftYamlHealthProbesIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.acme.quickstart;
1+
package io.quarkus.qe.openshift;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -46,4 +46,4 @@ public void testOpenShiftYamlHealthProbesWithCustomImageName() throws FileNotFou
4646
fail("Parsed yaml file didn't have expected Deployment definition");
4747
}
4848
}
49-
}
49+
}

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<module>004-quarkus-HHH-and-HV</module>
1515
<module>005-quarkus-and-maven-profiles</module>
1616
<module>006-quartz-manually-scheduled-job</module>
17-
<module>007-openshift-yaml-health-probes</module>
1817
<module>008-infinispan-getting-started</module>
1918
<module>009-quarkus-infinispan-grpc-kafka</module>
2019
<module>010-quarkus-opentracing-reactive-grpc</module>

0 commit comments

Comments
 (0)