diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java index f66eb0cd..2238bbf7 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java @@ -83,9 +83,9 @@ class DiscoveryClientFilterNamespaceIT { private static final String NAMESPACE = "default"; - private static final String NAMESPACE_LEFT = "left-namespace"; + private static final String NAMESPACE_LEFT = "left-namespace-k8s-client"; - private static final String NAMESPACE_RIGHT = "right-namespace"; + private static final String NAMESPACE_RIGHT = "right-namespace-k8s-client"; private static CoreV1Api api; @@ -178,7 +178,10 @@ class DiscoveryClientFilterNamespaceIT { networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE_LEFT, null, null, null, null, null, null); networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE_RIGHT, null, null, null, null, null, null); - authApi.deleteClusterRole("cluster-admin", null, null, null, null, null, null); + authApi.deleteClusterRoleBinding("admin-default-k8s-client", null, null, null, null, null, null); + + api.deleteNamespace(NAMESPACE_LEFT, null, null, null, null, null, null); + api.deleteNamespace(NAMESPACE_RIGHT, null, null, null, null, null, null); } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/resources/namespace-filter/cluster-admin-serviceaccount-role.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/resources/namespace-filter/cluster-admin-serviceaccount-role.yaml index d8eec949..390a5cc6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/resources/namespace-filter/cluster-admin-serviceaccount-role.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/resources/namespace-filter/cluster-admin-serviceaccount-role.yaml @@ -1,8 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - creationTimestamp: null - name: admin-default + name: admin-default-k8s-client roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java index 9f653aac..52385680 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java @@ -100,7 +100,7 @@ class Fabric8DiscoveryIT { Assertions.assertEquals(result.size(), 3); Assertions.assertTrue(result.contains("kubernetes")); Assertions.assertTrue(result.contains("spring-cloud-kubernetes-fabric8-client-discovery")); - Assertions.assertTrue(result.contains("servicea-wiremock")); + Assertions.assertTrue(result.contains("wiremock")); } private static void deleteManifests() { @@ -168,7 +168,7 @@ class Fabric8DiscoveryIT { mockServiceName = service.getMetadata().getName(); client.services().inNamespace(NAMESPACE).create(service); - Fabric8Utils.waitForDeployment(client, "servicea-wiremock-deployment", NAMESPACE, 2, 600); + Fabric8Utils.waitForDeployment(client, "wiremock-deployment", NAMESPACE, 2, 600); } catch (Exception e) { @@ -190,11 +190,11 @@ class Fabric8DiscoveryIT { } private static InputStream getMockService() { - return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-service.yaml"); + return Fabric8Utils.inputStream("wiremock/wiremock-service.yaml"); } private static InputStream getMockDeployment() { - return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-deployment.yaml"); + return Fabric8Utils.inputStream("wiremock/wiremock-deployment.yaml"); } private WebClient.Builder builder() { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java index 518ba66c..621fdcce 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java @@ -55,9 +55,9 @@ class Fabric8DiscoveryNamespaceFilterIT { private static final String NAMESPACE = "default"; - private static final String NAMESPACE_1 = "namespace1"; + private static final String NAMESPACE_LEFT = "namespace-left"; - private static final String NAMESPACE_2 = "namespace2"; + private static final String NAMESPACE_RIGHT = "namespace-right"; private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-discovery"; @@ -107,16 +107,16 @@ class Fabric8DiscoveryNamespaceFilterIT { .retryWhen(retrySpec()).block(); Assertions.assertEquals(services.size(), 1); - Assertions.assertTrue(services.contains("servicea-wiremock")); + Assertions.assertTrue(services.contains("wiremock")); - WebClient clientEndpoints = builder().baseUrl("localhost/endpoints/servicea-wiremock").build(); + WebClient clientEndpoints = builder().baseUrl("localhost/endpoints/wiremock").build(); List endpoints = clientEndpoints.method(HttpMethod.GET).retrieve() .bodyToMono(new ParameterizedTypeReference>() { }).retryWhen(retrySpec()).block(); Assertions.assertEquals(endpoints.size(), 1); - Assertions.assertEquals(endpoints.get(0).getMetadata().getNamespace(), NAMESPACE_1); + Assertions.assertEquals(endpoints.get(0).getMetadata().getNamespace(), NAMESPACE_LEFT); } @@ -128,11 +128,15 @@ class Fabric8DiscoveryNamespaceFilterIT { client.services().inNamespace(NAMESPACE).withName(serviceName).delete(); client.network().v1().ingresses().inNamespace(NAMESPACE).withName(ingressName).delete(); - client.services().inNamespace(NAMESPACE_1).withName(mockServiceName).delete(); - client.apps().deployments().inNamespace(NAMESPACE_1).withName(mockDeploymentName).delete(); + client.services().inNamespace(NAMESPACE_LEFT).withName(mockServiceName).delete(); + client.apps().deployments().inNamespace(NAMESPACE_LEFT).withName(mockDeploymentName).delete(); - client.services().inNamespace(NAMESPACE_2).withName(mockServiceName).delete(); - client.apps().deployments().inNamespace(NAMESPACE_2).withName(mockDeploymentName).delete(); + client.services().inNamespace(NAMESPACE_RIGHT).withName(mockServiceName).delete(); + client.apps().deployments().inNamespace(NAMESPACE_RIGHT).withName(mockDeploymentName).delete(); + + client.rbac().clusterRoleBindings().withName("admin-default").delete(); + client.namespaces().withName(NAMESPACE_LEFT).delete(); + client.namespaces().withName(NAMESPACE_RIGHT).delete(); } catch (Exception e) { @@ -151,7 +155,7 @@ class Fabric8DiscoveryNamespaceFilterIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); List env = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv(); - env.add(new EnvVar("JAVA_OPTS", "-Dspring.cloud.kubernetes.discovery.namespaces[0]=" + NAMESPACE_1, null)); + env.add(new EnvVar("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0", NAMESPACE_LEFT, null)); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(env); @@ -181,8 +185,8 @@ class Fabric8DiscoveryNamespaceFilterIT { private static void deployMockManifests() { try { - deployInMockInNamespace(NAMESPACE_1); - deployInMockInNamespace(NAMESPACE_2); + deployInMockInNamespace(NAMESPACE_LEFT); + deployInMockInNamespace(NAMESPACE_RIGHT); } catch (Exception e) { throw new RuntimeException(e); @@ -211,7 +215,7 @@ class Fabric8DiscoveryNamespaceFilterIT { mockServiceName = service.getMetadata().getName(); client.services().inNamespace(namespace).create(service); - Fabric8Utils.waitForDeployment(client, "servicea-wiremock-deployment", namespace, 2, 600); + Fabric8Utils.waitForDeployment(client, "wiremock-deployment", namespace, 2, 600); } private static InputStream getService() { @@ -231,11 +235,11 @@ class Fabric8DiscoveryNamespaceFilterIT { } private static InputStream getMockService() { - return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-service.yaml"); + return Fabric8Utils.inputStream("wiremock/wiremock-service.yaml"); } private static InputStream getMockDeployment() { - return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-deployment.yaml"); + return Fabric8Utils.inputStream("wiremock/wiremock-deployment.yaml"); } private WebClient.Builder builder() { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-deployment.yaml similarity index 79% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-deployment.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-deployment.yaml index 9d28eb62..7660d130 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-deployment.yaml @@ -1,18 +1,18 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: servicea-wiremock-deployment + name: wiremock-deployment spec: selector: matchLabels: - app: servicea-wiremock + app: wiremock template: metadata: labels: - app: servicea-wiremock + app: wiremock spec: containers: - - name: servicea-wiremock + - name: wiremock image: wiremock/wiremock:2.32.0 imagePullPolicy: IfNotPresent readinessProbe: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-service.yaml similarity index 65% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-service.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-service.yaml index ef30d58a..0b9dfe3f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-service.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-service.yaml @@ -2,13 +2,13 @@ apiVersion: v1 kind: Service metadata: labels: - app: servicea-wiremock - name: servicea-wiremock + app: wiremock + name: wiremock spec: ports: - name: http port: 8080 targetPort: 8080 selector: - app: servicea-wiremock + app: wiremock type: ClusterIP