Merge branch 'clean-cluster-role-binding' into major-changes-in-fabri…

…c8-discovery-implementation
spring-cloud · Sep 20, 2023 · f4fe50c · f4fe50c
2 parents d0e35c2 + 3ed982a
commit f4fe50c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java b/...springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java
@@ -71,6 +71,8 @@ class DiscoveryClientFilterNamespaceIT {
 
 	private static RbacAuthorizationV1Api rbacApi;
 
+	private static V1ClusterRoleBinding clusterRoleBinding;
+
 	@BeforeAll
 	static void beforeAll() throws Exception {
 		K3S.start();
@@ -83,18 +85,20 @@ static void beforeAll() throws Exception {
 
 		util = new Util(K3S);
 		rbacApi = new RbacAuthorizationV1Api();
+		clusterRoleBinding = (V1ClusterRoleBinding) util
+				.yaml("namespace-filter/cluster-admin-serviceaccount-role.yaml");
 		util.createNamespace(NAMESPACE_LEFT);
 		util.createNamespace(NAMESPACE_RIGHT);
 		util.setUp(NAMESPACE);
 
-		V1ClusterRoleBinding clusterRole = (V1ClusterRoleBinding) util
-				.yaml("namespace-filter/cluster-admin-serviceaccount-role.yaml");
-		rbacApi.createClusterRoleBinding(clusterRole, null, null, null, null);
+		rbacApi.createClusterRoleBinding(clusterRoleBinding, null, null, null, null);
 		discoveryServer(Phase.CREATE);
 	}
 
 	@AfterAll
 	static void afterAll() throws Exception {
+		rbacApi.deleteClusterRoleBinding(clusterRoleBinding.getMetadata().getName(), null, null, null, null, null,
+				null);
 		Commons.cleanUp(DISCOVERY_SERVER_APP_NAME, K3S);
 		Commons.cleanUp(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S);
 		discoveryServer(Phase.DELETE);

diff --git a/.../test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java b/.../test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java
@@ -113,6 +113,10 @@ class DiscoveryClientIT {
 
 	private static Util util;
 
+	private static RbacAuthorizationV1Api rbacApi;
+
+	private static V1ClusterRoleBinding clusterRoleBinding;
+
 	@BeforeAll
 	static void beforeAll() throws Exception {
 		K3S.start();
@@ -124,15 +128,15 @@ static void beforeAll() throws Exception {
 		Commons.loadSpringCloudKubernetesImage(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S);
 
 		util = new Util(K3S);
+		rbacApi = new RbacAuthorizationV1Api();
 		util.setUp(NAMESPACE);
 
 		util.createNamespace(NAMESPACE_LEFT);
 		util.createNamespace(NAMESPACE_RIGHT);
 
-		RbacAuthorizationV1Api rbacApi = new RbacAuthorizationV1Api();
-		V1ClusterRoleBinding clusterRole = (V1ClusterRoleBinding) util
+		clusterRoleBinding = (V1ClusterRoleBinding) util
 				.yaml("namespace-filter/cluster-admin-serviceaccount-role.yaml");
-		rbacApi.createClusterRoleBinding(clusterRole, null, null, null, null);
+		rbacApi.createClusterRoleBinding(clusterRoleBinding, null, null, null, null);
 
 		util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.CREATE, false);
 		util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.CREATE, false);
@@ -143,6 +147,8 @@ static void beforeAll() throws Exception {
 
 	@AfterAll
 	static void afterAll() throws Exception {
+		rbacApi.deleteClusterRoleBinding(clusterRoleBinding.getMetadata().getName(), null, null, null, null, null,
+				null);
 		Commons.cleanUp(DISCOVERY_SERVER_APP_NAME, K3S);
 		Commons.cleanUp(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S);