Skip to content

Commit 065959f

Browse files
committed
test (#10620): labels on ingress and routes
1 parent 9abd105 commit 065959f

File tree

4 files changed

+20
-1
lines changed

4 files changed

+20
-1
lines changed

integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,13 @@ public void assertGeneratedResources() throws IOException {
9696

9797
assertThat(kubernetesList).filteredOn(i -> "Ingress".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
9898
assertThat(i).isInstanceOfSatisfying(Ingress.class, in -> {
99+
//Check that lables and annotations are also applied to Ingresses (#10260)
100+
assertThat(i.getMetadata()).satisfies(m -> {
101+
assertThat(m.getName()).isEqualTo("test-it");
102+
assertThat(m.getLabels()).contains(entry("foo", "bar"));
103+
assertThat(m.getAnnotations()).contains(entry("bar", "baz"));
104+
});
105+
99106
assertThat(in.getSpec().getRules()).hasOnlyOneElementSatisfying(r -> {
100107
assertThat(r.getHost()).isEqualTo("example.com");
101108
});

integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import io.fabric8.kubernetes.api.model.HasMetadata;
1717
import io.fabric8.kubernetes.api.model.PodSpec;
1818
import io.fabric8.kubernetes.api.model.Service;
19+
import io.fabric8.openshift.api.model.Route;
1920
import io.quarkus.test.ProdBuildResults;
2021
import io.quarkus.test.ProdModeTestResults;
2122
import io.quarkus.test.QuarkusProdModeTest;
@@ -66,6 +67,15 @@ public void assertGeneratedResources() throws IOException {
6667
});
6768
});
6869

69-
assertThat(openshiftList).filteredOn(h -> "Route".equals(h.getKind())).hasSize(1);
70+
assertThat(openshiftList).filteredOn(i -> "Route".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
71+
assertThat(i).isInstanceOfSatisfying(Route.class, in -> {
72+
//Check that lables and annotations are also applied to Routes (#10260)
73+
assertThat(i.getMetadata()).satisfies(m -> {
74+
assertThat(m.getName()).isEqualTo("test-it");
75+
assertThat(m.getLabels()).contains(entry("foo", "bar"));
76+
assertThat(m.getAnnotations()).contains(entry("bar", "baz"));
77+
});
78+
});
79+
});
7080
}
7181
}

integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
quarkus.http.port=9090
22
quarkus.kubernetes.name=test-it
33
quarkus.kubernetes.labels.foo=bar
4+
quarkus.kubernetes.annotations.bar=baz
45
quarkus.kubernetes.env-vars.my-env-var.value=SOMEVALUE
56
quarkus.kubernetes.env-vars.my-name.field=metadata.name
67
quarkus.container-image.group=grp

integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ quarkus.http.port=9090
22
quarkus.kubernetes.deployment-target=openshift
33
quarkus.openshift.name=test-it
44
quarkus.openshift.labels.foo=bar
5+
quarkus.openshift.annotations.bar=baz
56
quarkus.openshift.env-vars.my-env-var.value=SOMEVALUE
67
quarkus.openshift.group=grp
78
quarkus.openshift.expose=true

0 commit comments

Comments
 (0)