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

Merge branch '2.1.x' into 3.0.x

Browse Source
This commit is contained in:
Ryan Baxter
2023-06-16 08:51:09 -04:00
parent 2aaf20c36a 08d33e0b74
commit ab1bf742d5
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientConfigServerBootstrapperTests.java
View File

@@ -156,6 +156,7 @@ class KubernetesClientConfigServerBootstrapperTests {
if (env != null && env.length > 0) {
set.addAll(Arrays.asList(env));
}
set.add("server.port=0");
set.add("spring.cloud.config.discovery.enabled=true");
set.add("spring.config.import=optional:configserver:");
set.add("spring.cloud.config.discovery.service-id=spring-cloud-kubernetes-configserver");

15
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapperTests.java
View File

@@ -16,20 +16,6 @@
package org.springframework.cloud.kubernetes.fabric8.discovery;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
import io.fabric8.kubernetes.api.model.Endpoints;
import io.fabric8.kubernetes.api.model.EndpointsBuilder;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.KubernetesClient;
@@ -133,6 +119,7 @@ class Fabric8ConfigServerBootstrapperTests {
set.add("spring.config.import=optional:configserver:");
set.add("spring.cloud.config.discovery.service-id=spring-cloud-kubernetes-configserver");
set.add("spring.cloud.kubernetes.client.namespace=test");
set.add("server.port=0");
return set.toArray(new String[0]);
}