Skip to content

Commit

Permalink
Merge branch '3.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanjbaxter
ryanjbaxter committed Sep 20, 2023
2 parents 0d84b0f + e544388 commit fea48d7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
10 changes: 7 additions & 3 deletions ...springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ class DiscoveryClientFilterNamespaceIT {

private static RbacAuthorizationV1Api rbacApi;

private static V1ClusterRoleBinding clusterRoleBinding;

@BeforeAll
static void beforeAll() throws Exception {
K3S.start();
Expand All @@ -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);
Expand Down
12 changes: 9 additions & 3 deletions .../test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand All @@ -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);

Expand Down

1 comment on commit fea48d7

@wind57
Copy link
Contributor

@wind57 wind57 commented on fea48d7 Sep 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am facing this issue as-well today, it seems that some repos are very slow in maven today and it makes our build timeout: we have a hard limit of 60 minutes per stage at the moment. @ryanjbaxter wanna re-trigger this one?

Please sign in to comment.