From d5ed04c89d7cd20876ffa529da7a7c061fdf60f8 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 8 Jan 2025 18:52:29 +0000 Subject: [PATCH 1/2] Bumping versions --- .../client/discovery/Fabric8DiscoveryAllServicesIT.java | 1 - .../discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java | 3 +-- .../discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java index b241a68f..ef5d34fa 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java @@ -39,7 +39,6 @@ import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Test */ class Fabric8DiscoveryAllServicesIT extends Fabric8DiscoveryBase { - private static Service externalServiceName; @BeforeAll diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java index 1a8393f7..c307c55c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java @@ -34,8 +34,7 @@ import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Test @TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.namespaces[0]=a-uat", "spring.cloud.kubernetes.discovery.namespaces[1]=b-uat", "spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches 'a-uat$'", - "logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" -}) + "logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" }) class Fabric8DiscoveryFilterMatchOneNamespaceIT extends Fabric8DiscoveryBase { private static final String NAMESPACE_A_UAT = "a-uat"; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java index 83e84f74..d8da983a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java @@ -34,8 +34,7 @@ import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Test @TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.namespaces[0]=a-uat", "spring.cloud.kubernetes.discovery.namespaces[1]=b-uat", "spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches '^.*uat$'", - "logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" -}) + "logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" }) class Fabric8DiscoveryFilterMatchTwoNamespacesIT extends Fabric8DiscoveryBase { private static final String NAMESPACE_A_UAT = "a-uat"; From 6c9791aa3dfb4533c739bcda19efe9dcb9691336 Mon Sep 17 00:00:00 2001 From: erabii Date: Wed, 8 Jan 2025 20:43:58 +0000 Subject: [PATCH 2/2] fix (#1829) --- .../tests/commons/FixedPortsK3sContainer.java | 2 +- .../tests/commons/fabric8_client/Util.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/FixedPortsK3sContainer.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/FixedPortsK3sContainer.java index 05c275db..aa877a7f 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/FixedPortsK3sContainer.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/FixedPortsK3sContainer.java @@ -48,7 +48,7 @@ final class FixedPortsK3sContainer extends K3sContainer { * Command to use when starting rancher. Without "server" option, traefik is not * installed */ - private static final String RANCHER_COMMAND = "server"; + private static final String RANCHER_COMMAND = "server --disable=metric-server"; static final K3sContainer CONTAINER = new FixedPortsK3sContainer(DockerImageName.parse(RANCHER_VERSION)) .configureFixedPorts() diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java index 8d98a078..11f0fedc 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java @@ -24,6 +24,7 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; +import io.fabric8.kubernetes.api.model.APIService; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.NamespaceBuilder; import io.fabric8.kubernetes.api.model.Pod; @@ -210,6 +211,21 @@ public final class Util { public void deleteNamespace(String name) { try { + + // sometimes we get errors like : + + // "message": "Discovery failed for some groups, + // 1 failing: unable to retrieve the complete list of server APIs: + // metrics.k8s.io/v1beta1: stale GroupVersion discovery: metrics.k8s.io/v1beta1" + + // but even when it works OK, the finalizers are slowing down the deletion + List apiServices = client.apiServices().list().getItems(); + apiServices.stream() + .map(apiService -> apiService.getMetadata().getName()) + .filter(apiServiceName -> apiServiceName.contains("metrics.k8s.io")) + .findFirst() + .ifPresent(apiServiceName -> client.apiServices().withName(apiServiceName).delete()); + client.namespaces() .resource(new NamespaceBuilder().withNewMetadata().withName(name).and().build()) .delete();