SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbac clean-up in integration tests (#1447)

Browse Source 
* fix issue

* fix issue
This commit is contained in:
erabii
2023-09-20 15:44:12 +03:00
committed by GitHub
parent fb656dd110
commit e544388db3
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java
View File

@@ -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 @@ class DiscoveryClientFilterNamespaceIT {
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);

12
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java
View File

@@ -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 @@ class DiscoveryClientIT {
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 @@ class DiscoveryClientIT {
@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);