-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6977 from iocanel/issue-6726
fix (#6726): Bump dekorate to 0.10.8 and add integration test that
- Loading branch information
Showing
6 changed files
with
189 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
117 changes: 117 additions & 0 deletions
117
integration-tests/kubernetes/src/it/kubernetes-with-quarkus-app-name/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <?xml version="1.0"?> | ||
| <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.acme</groupId> | ||
| <artifactId>kubernetes-with-quarkus-app-name</artifactId> | ||
| <version>0.1-SNAPSHOT</version> | ||
| <properties> | ||
| <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
| <surefire-plugin.version>2.22.0</surefire-plugin.version> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| </properties> | ||
| <dependencyManagement> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-bom</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>pom</type> | ||
| <scope>import</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </dependencyManagement> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-resteasy</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-kubernetes</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-junit5</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.rest-assured</groupId> | ||
| <artifactId>rest-assured</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-maven-plugin</artifactId> | ||
| <version>@project.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>build</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>${surefire-plugin.version}</version> | ||
| <configuration> | ||
| <systemProperties> | ||
| <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager> | ||
| </systemProperties> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <profiles> | ||
| <profile> | ||
| <id>native</id> | ||
| <activation> | ||
| <property> | ||
| <name>native</name> | ||
| </property> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-maven-plugin</artifactId> | ||
| <version>@project.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>native-image</goal> | ||
| </goals> | ||
| <configuration> | ||
| <enableHttpUrlHandler>true</enableHttpUrlHandler> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-failsafe-plugin</artifactId> | ||
| <version>${surefire-plugin.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>integration-test</goal> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| <configuration> | ||
| <systemProperties> | ||
| <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path> | ||
| </systemProperties> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
16 changes: 16 additions & 0 deletions
16
...ests/kubernetes/src/it/kubernetes-with-quarkus-app-name/src/main/java/org/acme/Hello.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package org.acme; | ||
|
|
||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| @Path("/hello") | ||
| public class Hello { | ||
|
|
||
| @GET | ||
| @Produces(MediaType.TEXT_PLAIN) | ||
| public String hello() { | ||
| return "hello"; | ||
| } | ||
| } |
10 changes: 10 additions & 0 deletions
10
...ernetes/src/it/kubernetes-with-quarkus-app-name/src/main/resources/application.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # Configuration file | ||
| quarkus.application.name=test | ||
| kubernetes.deployment.target=kubernetes,openshift | ||
| kubernetes.name=foo | ||
| kubernetes.group=bar | ||
| kubernetes.version=1.0-kube | ||
|
|
||
| openshift.name=ofoo | ||
| openshift.group=obar | ||
| openshift.version=1.0-openshift |
38 changes: 38 additions & 0 deletions
38
integration-tests/kubernetes/src/it/kubernetes-with-quarkus-app-name/verify.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import io.dekorate.utils.Serialization | ||
| import io.dekorate.deps.kubernetes.api.model.* | ||
| import io.dekorate.deps.kubernetes.api.model.apps.Deployment; | ||
|
|
||
| //Check that file exits | ||
| String base = basedir | ||
|
|
||
| File openshiftYml = new File(base, "target/kubernetes/openshift.yml") | ||
| assert openshiftYml.exists() | ||
|
|
||
| openshiftYml.withInputStream { stream -> | ||
| //Check that its parse-able | ||
| KubernetesList list = Serialization.unmarshalAsList(stream) | ||
| assert list != null | ||
| list.items.each { | ||
| assert it.metadata.name == "ofoo" || it.metadata.name == "s2i-java" | ||
| assert it.metadata.labels.get("app") == "ofoo" | ||
| assert it.metadata.labels.get("version") == "1.0-openshift" | ||
|
|
||
| } | ||
| } | ||
|
|
||
| File kubernetesYml = new File(base, "target/kubernetes/kubernetes.yml") | ||
| assert kubernetesYml.exists() | ||
|
|
||
| kubernetesYml.withInputStream { stream -> | ||
| //Check that its parse-able | ||
| KubernetesList list = Serialization.unmarshalAsList(stream) | ||
| assert list != null | ||
| list.items.each { | ||
| assert it.metadata.name == "foo" | ||
| assert it.metadata.labels.get("app") == "foo" | ||
| assert it.metadata.labels.get("version") == "1.0-kube" | ||
|
|
||
| } | ||
| Deployment deployment = list.items.find{r -> r.kind == "Deployment"} | ||
| assert deployment != null | ||
| } |