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

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2025-01-08 15:44:54 -05:00
parent f791f97162 6c9791aa3d
commit 74d1fdfa7e
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/FixedPortsK3sContainer.java
View File

@@ -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()

16
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java
View File

@@ -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<APIService> 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();