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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2023-11-17 21:40:03 +00:00
parent 8c055fbc45
commit 87f83df05f
4 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@@ -2035,7 +2035,7 @@ An image of the Spring Cloud Discovery Server is hosted on https://hub.docker.co
However, if you need to customize the discovery server behavior or prefer to build the image yourself you can easily build your own
image from the https://github.com/spring-cloud/spring-cloud-kubernetes/tree/main/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver[source code on GitHub] and use that.
Below is a sample deployment YAML you can use to deploy the Kubernetes Configuration Watcher to Kubernetes.
Below is a sample deployment YAML you can use to deploy the Kubernetes Discovery Server to Kubernetes.
====
[source,yaml]

26
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java
View File

@@ -69,19 +69,19 @@ class ConfigServerBootstrapperTests {
wireMockServer.start();
WireMock.configureFor(wireMockServer.port());
String APPS_NAME = """
[{
"instanceId": "uid2",
"serviceId": "spring-cloud-kubernetes-configserver",
"host": "localhost",
"port": "%s",
"uri": "%s",
"secure":false,
"metadata":{"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace1",
"cluster": null,
"scheme":"http"
}]
""".formatted(wireMockServer.port(), wireMockServer.baseUrl());
[{
"instanceId": "uid2",
"serviceId": "spring-cloud-kubernetes-configserver",
"host": "localhost",
"port": "%s",
"uri": "%s",
"secure":false,
"metadata":{"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace1",
"cluster": null,
"scheme":"http"
}]
""".formatted(wireMockServer.port(), wireMockServer.baseUrl());
System.out.println(APPS_NAME);

80
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java
View File

@@ -46,54 +46,54 @@ import static org.assertj.core.api.Assertions.assertThat;
class KubernetesDiscoveryClientTests {
private static final String APPS = """
[{
"name": "test-svc-1",
"serviceInstances":
[{
"instanceId": "uid1",
"serviceId": "test-svc-1",
"name": "test-svc-1",
"serviceInstances":
[{
"instanceId": "uid1",
"serviceId": "test-svc-1",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata":{"http": "8080"},
"namespace": "namespace1",
"cluster": null,
"scheme": "http"
}]
},
{
"name": "test-svc-3",
"serviceInstances":
[{
"instanceId": "uid2",
"serviceId": "test-svc-3",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace2",
"cluster":null,
"scheme":"http"
}]
}]
""";
private static final String APPS_NAME = """
[{
"instanceId": "uid2",
"serviceId": "test-svc-3",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata":{"http": "8080"},
"namespace": "namespace1",
"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace2",
"cluster": null,
"scheme": "http"
}]
},
{
"name": "test-svc-3",
"serviceInstances":
[{
"instanceId": "uid2",
"serviceId": "test-svc-3",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace2",
"cluster":null,
"scheme":"http"
}]
}]
""";
private static final String APPS_NAME = """
[{
"instanceId": "uid2",
"serviceId": "test-svc-3",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace2",
"cluster": null,
"scheme": "http"
}]
""";
""";
private static WireMockServer wireMockServer;

72
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java
View File

@@ -39,25 +39,41 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options
class KubernetesReactiveDiscoveryClientTests {
private static final String APPS = """
[{
"name": "test-svc-1",
"serviceInstances":
[{
"instanceId": "uid1",
"serviceId": "test-svc-1",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata": {"http":"8080"},
"namespace": "namespace1",
"cluster": null,
"scheme": "http"
}]
},
{
"name": "test-svc-3",
"serviceInstances":
[{
"name": "test-svc-1",
"serviceInstances":
[{
"instanceId": "uid1",
"serviceId": "test-svc-1",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata": {"http":"8080"},
"namespace": "namespace1",
"cluster": null,
"scheme": "http"
}]
},
{
"name": "test-svc-3",
"serviceInstances":
[{
"instanceId": "uid2",
"serviceId": "test-svc-3",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace1",
"cluster": null,
"scheme": "http"
}]
}]
""";
private static final String APPS_NAME = """
[{
"instanceId": "uid2",
"serviceId": "test-svc-3",
@@ -70,23 +86,7 @@ class KubernetesReactiveDiscoveryClientTests {
"cluster": null,
"scheme": "http"
}]
}]
""";
private static final String APPS_NAME = """
[{
"instanceId": "uid2",
"serviceId": "test-svc-3",
"host": "2.2.2.2",
"port": 8080,
"uri": "http://2.2.2.2:8080",
"secure": false,
"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
"namespace": "namespace1",
"cluster": null,
"scheme": "http"
}]
""";
""";
private static WireMockServer wireMockServer;