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

fix tests

Browse Source 
Signed-off-by: wind57 <eugen.rabii@gmail.com>
This commit is contained in:
wind57
2025-03-30 18:26:48 +03:00
parent 05859a328b
commit 8bfbfa7dbe
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterIT.java
View File

@@ -51,16 +51,16 @@ class Fabric8DiscoveryFilterIT extends Fabric8DiscoveryBase {
util.createNamespace(NAMESPACE_A_UAT);
util.createNamespace(NAMESPACE_B_UAT);
util.wiremock(NAMESPACE_A_UAT, Phase.CREATE);
util.wiremock(NAMESPACE_B_UAT, Phase.CREATE);
util.wiremock(NAMESPACE_A_UAT, Phase.CREATE, false);
util.wiremock(NAMESPACE_B_UAT, Phase.CREATE, false);
}
@AfterEach
void afterEach() {
util.wiremock(NAMESPACE_A_UAT, Phase.DELETE);
util.wiremock(NAMESPACE_B_UAT, Phase.DELETE);
util.wiremock(NAMESPACE_A_UAT, Phase.DELETE, false);
util.wiremock(NAMESPACE_B_UAT, Phase.DELETE, false);
util.deleteNamespace(NAMESPACE_A_UAT);
util.deleteNamespace(NAMESPACE_B_UAT);

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

@@ -295,7 +295,12 @@ public final class Util {
});
}
public void wiremock(String namespace, Phase phase) {
/**
* 'withNodePort' specifies if we add the NodePort or not. It is needed because we
* sometimes deploy two instances of wiremock, and they can't have the same NodePort
* exposed
*/
public void wiremock(String namespace, Phase phase, boolean withNodePort) {
InputStream deploymentStream = inputStream("wiremock/wiremock-deployment.yaml");
InputStream serviceStream = inputStream("wiremock/wiremock-service.yaml");
@@ -305,6 +310,11 @@ public final class Util {
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(imageWithVersion);
Service service = client.services().load(serviceStream).item();
if (!withNodePort) {
// we assume we only have one 'http' port
service.getSpec().getPorts().get(0).setNodePort(null);
service.getSpec().setType("ClusterIP");
}
if (phase.equals(Phase.CREATE)) {
deployment.getMetadata().setNamespace(namespace);