Merge pull request #12366 from geoand/#12365

Fix broken Kubernetes tests
quarkusio · Sep 28, 2020 · 51ac9da · 51ac9da
2 parents 4fc99b9 + 2fc2fd0
commit 51ac9da
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 33 deletions.
diff --git a/...-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java b/...-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java
@@ -62,39 +62,37 @@ public void assertGeneratedResources() throws IOException {
             });
         });
 
-        assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).hasSize(2);
-
-        assertThat(kubernetesList).anySatisfy(res -> {
-            assertThat(res).isInstanceOfSatisfying(RoleBinding.class, roleBinding -> {
-                assertThat(roleBinding.getMetadata()).satisfies(m -> {
-                    assertThat(m.getName()).isEqualTo("kubernetes-config-with-secrets:view-secrets");
-                });
-
-                assertThat(roleBinding.getRoleRef().getKind()).isEqualTo("Role");
-                assertThat(roleBinding.getRoleRef().getName()).isEqualTo("view-secrets");
-
-                assertThat(roleBinding.getSubjects()).singleElement().satisfies(subject -> {
-                    assertThat(subject.getKind()).isEqualTo("ServiceAccount");
-                    assertThat(subject.getName()).isEqualTo("kubernetes-config-with-secrets");
-                });
-            });
-        });
-
-        assertThat(kubernetesList).anySatisfy(res -> {
-            assertThat(res).isInstanceOfSatisfying(RoleBinding.class, roleBinding -> {
-                assertThat(roleBinding.getMetadata()).satisfies(m -> {
-                    assertThat(m.getName()).isEqualTo("kubernetes-config-with-secrets:view");
-                });
-
-                assertThat(roleBinding.getRoleRef().getKind()).isEqualTo("ClusterRole");
-                assertThat(roleBinding.getRoleRef().getName()).isEqualTo("view");
-
-                assertThat(roleBinding.getSubjects()).singleElement().satisfies(subject -> {
-                    assertThat(subject.getKind()).isEqualTo("ServiceAccount");
-                    assertThat(subject.getName()).isEqualTo("kubernetes-config-with-secrets");
+        assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).hasSize(2)
+                .anySatisfy(res -> {
+                    assertThat(res).isInstanceOfSatisfying(RoleBinding.class, roleBinding -> {
+                        assertThat(roleBinding.getMetadata()).satisfies(m -> {
+                            assertThat(m.getName()).isEqualTo("kubernetes-config-with-secrets-view-secrets");
+                        });
+
+                        assertThat(roleBinding.getRoleRef().getKind()).isEqualTo("Role");
+                        assertThat(roleBinding.getRoleRef().getName()).isEqualTo("view-secrets");
+
+                        assertThat(roleBinding.getSubjects()).singleElement().satisfies(subject -> {
+                            assertThat(subject.getKind()).isEqualTo("ServiceAccount");
+                            assertThat(subject.getName()).isEqualTo("kubernetes-config-with-secrets");
+                        });
+                    });
+                })
+                .anySatisfy(res -> {
+                    assertThat(res).isInstanceOfSatisfying(RoleBinding.class, roleBinding -> {
+                        assertThat(roleBinding.getMetadata()).satisfies(m -> {
+                            assertThat(m.getName()).isEqualTo("kubernetes-config-with-secrets-view");
+                        });
+
+                        assertThat(roleBinding.getRoleRef().getKind()).isEqualTo("ClusterRole");
+                        assertThat(roleBinding.getRoleRef().getName()).isEqualTo("view");
+
+                        assertThat(roleBinding.getSubjects()).singleElement().satisfies(subject -> {
+                            assertThat(subject.getKind()).isEqualTo("ServiceAccount");
+                            assertThat(subject.getName()).isEqualTo("kubernetes-config-with-secrets");
+                        });
+                    });
                 });
-            });
-        });
     }
 
 }
diff --git a/...quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java b/...quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java
@@ -67,7 +67,7 @@ public void assertGeneratedResources() throws IOException {
         });
 
         assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).singleElement().satisfies(h -> {
-            assertThat(h.getMetadata().getName()).isEqualTo("kubernetes-with-client:view");
+            assertThat(h.getMetadata().getName()).isEqualTo("kubernetes-with-client-view");
         });
     }
 }