fix : Remove assertExpose() from ServiceAssertion

Now that we're removing ExposeEnricher, there is no need to verify whether generated Service contains `expose: true` label. Signed-off-by: Rohan Kumar <[email protected]>
eclipse-jkube · Apr 11, 2022 · 5df04a8 · 5df04a8
1 parent 60af4aa
commit 5df04a8
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 18 deletions.
diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/assertions/ServiceAssertion.java b/it/src/test/java/org/eclipse/jkube/integrationtests/assertions/ServiceAssertion.java
@@ -69,11 +69,6 @@ public static ServiceAssertion awaitService(JKubeCase jKubeCase, String namespac
     return assertService(service).apply(jKubeCase);
   }
 
-  public ServiceAssertion assertExposed() {
-    assertThat(getKubernetesResource().getMetadata().getLabels(), hasEntry("expose", "true"));
-    return this;
-  }
-
   public ServiceAssertion assertIsClusterIp() {
     assertThat(getKubernetesResource().getSpec().getType(), equalTo("ClusterIP"));
     return this;

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/dockerfile/SimpleK8sITCase.java b/it/src/test/java/org/eclipse/jkube/integrationtests/dockerfile/SimpleK8sITCase.java
@@ -179,7 +179,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
       .logContains("Started Application in", 40)
       .getKubernetesResource();
     awaitService(this, pod.getMetadata().getNamespace())
-      .assertExposed()
       .assertIsNodePort()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/openliberty/OpenLiberty.java b/it/src/test/java/org/eclipse/jkube/integrationtests/openliberty/OpenLiberty.java
@@ -48,7 +48,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
       LOG_TIMEOUT);
     awaitService(this, pod.getMetadata().getNamespace())
       .assertIsNodePort()
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("glrpc", 9080, true)
       .assertNodePortResponse("glrpc", equalTo("Hello, World."));

diff --git a/...c/test/java/org/eclipse/jkube/integrationtests/quarkus/na7ive/QuarkusNativeK8sITCase.java b/...c/test/java/org/eclipse/jkube/integrationtests/quarkus/na7ive/QuarkusNativeK8sITCase.java
@@ -153,7 +153,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
     assertPod(pod).apply(this).logContains("quarkus-native 0.0.0-SNAPSHOT native (powered by Quarkus 1.8.3.Final) started in", 60);
     awaitService(this, pod.getMetadata().getNamespace())
       .assertIsNodePort()
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http",

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/quarkus/rest/Quarkus.java b/it/src/test/java/org/eclipse/jkube/integrationtests/quarkus/rest/Quarkus.java
@@ -51,7 +51,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
     assertPod(pod).apply(this).logContains("quarkus-rest 0.0.0-SNAPSHOT on JVM (powered by Quarkus 1.8.3.Final) started in", 60);
     awaitService(this, pod.getMetadata().getNamespace())
       .assertIsNodePort()
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http",

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/crd/CustomResourceApp.java b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/crd/CustomResourceApp.java
@@ -53,7 +53,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
     assertFrameworkCustomResourceDefinitionApplied(this);
     assertFrameworkCustomResourcesApplied(this, namespace);
     awaitService(this, namespace)
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http",

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/zeroconfig/ZeroConfig.java b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/zeroconfig/ZeroConfig.java
@@ -51,7 +51,6 @@ final Pod assertThatShouldApplyResources() throws InterruptedException, IOExcept
       .logContains("Started ZeroConfigApplication in", 40)
       .getKubernetesResource();
     awaitService(this, pod.getMetadata().getNamespace())
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, false);
     return pod;

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/thorntail/Thorntail.java b/it/src/test/java/org/eclipse/jkube/integrationtests/thorntail/Thorntail.java
@@ -42,7 +42,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
     assertPod(pod).apply(this).logContains("Deployed \"thorntail-microprofile-0.0.0-SNAPSHOT.war\"", 60);
     awaitService(this, pod.getMetadata().getNamespace())
       .assertIsNodePort()
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http", equalTo("JKube from Thorntail rocks!"));

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/vertx/Vertx.java b/it/src/test/java/org/eclipse/jkube/integrationtests/vertx/Vertx.java
@@ -42,7 +42,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
     assertPod(pod).apply(this).logContains("Succeeded in deploying verticle", 60);
     awaitService(this, pod.getMetadata().getNamespace())
       .assertIsNodePort()
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http", equalTo("Hello from JKube!"));

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/webapp/jetty/Jetty.java b/it/src/test/java/org/eclipse/jkube/integrationtests/webapp/jetty/Jetty.java
@@ -43,7 +43,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
     final Pod pod = awaitPod(this).getKubernetesResource();
     assertPod(pod).apply(this).logContains("Server:main: Started", 60);
     awaitService(this, pod.getMetadata().getNamespace())
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http", containsString("<h2>Eclipse JKube on Jetty rocks!</h2>"));

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/webapp/wildfly/WildFly.java b/it/src/test/java/org/eclipse/jkube/integrationtests/webapp/wildfly/WildFly.java
@@ -43,7 +43,6 @@ final Pod assertThatShouldApplyResources()  throws  Exception{
     assertPod(pod).apply(this).logContains("Deployed", 60);
     awaitService(this, pod.getMetadata().getNamespace())
       .assertIsNodePort()
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http", containsString("<h2>Eclipse JKube rocks!!</h2>"));

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/webapp/zeroconfig/ZeroConfig.java b/it/src/test/java/org/eclipse/jkube/integrationtests/webapp/zeroconfig/ZeroConfig.java
@@ -48,7 +48,6 @@ final Pod assertThatShouldApplyResources() throws InterruptedException, IOExcept
     final Pod pod = awaitPod(this).getKubernetesResource();
     assertPod(pod).apply(this).logContains("Catalina.start Server startup", 60);
     awaitService(this, pod.getMetadata().getNamespace())
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, false);
     return pod;

diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/wildfly/jar/WildflyJar.java b/it/src/test/java/org/eclipse/jkube/integrationtests/wildfly/jar/WildflyJar.java
@@ -45,7 +45,6 @@ final Pod assertThatShouldApplyResources() throws Exception {
       .logContains("WFLYSRV0025", 15);
     awaitService(this, pod.getMetadata().getNamespace())
       .assertIsNodePort()
-      .assertExposed()
       .assertPorts(hasSize(1))
       .assertPort("http", 8080, true)
       .assertNodePortResponse("http", equalTo("JKube from WildFly JAR rocks!"));

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     <com.fasterxml.jackson.core.version>2.13.1</com.fasterxml.jackson.core.version>
     <com.fasterxml.jackson.dataformat.yaml.version>2.13.1</com.fasterxml.jackson.dataformat.yaml.version>
     <fabric8.kubernetes-client.version>5.11.2</fabric8.kubernetes-client.version>
-    <jkube.version>1.7.0-SNAPSHOT</jkube.version>
+    <jkube.version>1.8.0-SNAPSHOT</jkube.version>
     <junit.version>5.8.1</junit.version>
     <license-maven-plugin.version>3.0</license-maven-plugin.version>
     <hamcrest.version>2.0.0.0</hamcrest.version>