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

#562 Adding integration test for SERVICE mode + fixing ascii docs

Browse Source
This commit is contained in:
piomin
2020-08-25 22:43:17 +02:00
parent b2003179a9
commit 0d6ded52d7
6 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/main/asciidoc/spring-cloud-kubernetes.adoc
View File

@@ -22,6 +22,8 @@ include::pod-health-indicator.adoc[]
include::leader-election.adoc[]
include::load-balancer.adoc[]
include::security-service-accounts.adoc[]
include::service-registry.adoc[]

13
spring-cloud-kubernetes-dependencies/pom.xml
View File

@@ -34,6 +34,7 @@
<properties>
<arquillian.version>1.4.0.Final</arquillian.version>
<arquillian-cube.version>1.15.2</arquillian-cube.version>
<hoverfly.version>0.13.0</hoverfly.version>
<kubernetes-client.version>4.10.3</kubernetes-client.version>
<istio-client.version>1.1.1</istio-client.version>
<mockwebserver.version>0.1.2</mockwebserver.version>
@@ -142,6 +143,18 @@
<version>${arquillian-cube.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.specto</groupId>
<artifactId>hoverfly-java-junit5</artifactId>
<version>${hoverfly.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.specto</groupId>
<artifactId>hoverfly-java</artifactId>
<version>${hoverfly.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>

2
spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml
View File

@@ -34,13 +34,11 @@
<dependency>
<groupId>io.specto</groupId>
<artifactId>hoverfly-java-junit5</artifactId>
<version>0.13.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.specto</groupId>
<artifactId>hoverfly-java</artifactId>
<version>0.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>

4
spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java
View File

@@ -45,7 +45,7 @@ public class LoadBalancerAllNamespacesTests {
static KubernetesClient client;
@BeforeAll
public static void setup() {
static void setup() {
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
client.getConfiguration().getMasterUrl());
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -57,7 +57,7 @@ public class LoadBalancerAllNamespacesTests {
}
@Test
public void testLoadBalancerDifferentNamespace() {
void testLoadBalancerDifferentNamespace() {
createTestData("service-b", "b");
String response = restTemplate.getForObject("http://service-b/greeting",
String.class);

6
spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java
View File

@@ -43,7 +43,7 @@ public class LoadBalancerTests {
static KubernetesClient client;
@BeforeAll
public static void setup() {
static void setup() {
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
client.getConfiguration().getMasterUrl());
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -55,7 +55,7 @@ public class LoadBalancerTests {
}
@Test
public void testLoadBalancerSameNamespace() {
void testLoadBalancerSameNamespace() {
createTestData("service-a", "test");
String response = restTemplate.getForObject("http://service-a/greeting",
String.class);
@@ -64,7 +64,7 @@ public class LoadBalancerTests {
}
@Test
public void testLoadBalancerDifferentNamespace() {
void testLoadBalancerDifferentNamespace() {
createTestData("service-b", "b");
Assertions.assertThrows(IllegalStateException.class, () -> restTemplate
.getForObject("http://service-b/greeting", String.class));

69
spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerWithServiceTests.java
View File

@@ -1,3 +1,19 @@
/*
* Copyright 2013-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.kubernetes.loadbalancer;
import java.util.HashMap;
@@ -26,10 +42,8 @@ import static io.specto.hoverfly.junit.dsl.HttpBodyConverter.json;
import static io.specto.hoverfly.junit.dsl.ResponseCreators.success;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(properties = {
"spring.cloud.kubernetes.loadbalancer.mode=SERVICE",
"spring.cloud.kubernetes.loadbalancer.enabled=true"
})
@TestPropertySource(properties = { "spring.cloud.kubernetes.loadbalancer.mode=SERVICE",
"spring.cloud.kubernetes.loadbalancer.enabled=true" })
@EnableKubernetesMockClient
@ExtendWith(HoverflyExtension.class)
public class LoadBalancerWithServiceTests {
@@ -40,50 +54,41 @@ public class LoadBalancerWithServiceTests {
static KubernetesClient client;
@BeforeAll
public static void setup() {
static void setup() {
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
client.getConfiguration().getMasterUrl());
client.getConfiguration().getMasterUrl());
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY,
"false");
"false");
System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true");
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
}
@Test
public void testLoadBalancerInServiceMode(Hoverfly hoverfly) {
void testLoadBalancerInServiceMode(Hoverfly hoverfly) {
hoverfly.simulate(
dsl(service("http://service-a.test.svc.cluster.local:8080")
.get("/greeting")
.willReturn(success().body("greeting"))),
dsl(service(RequestFieldMatcher.newRegexMatcher("(kubernetes.docker.internal).*"))
.post("/api/v1/namespaces/test/services").anyBody()
.willReturn(success()
.body(json(buildService("service-a", 8080, "test"))))
.get("/api/v1/namespaces/test/services/service-a")
.willReturn(success()
.body(json(buildService("service-a", 8080, "test"))))));
dsl(service("http://service-a.test.svc.cluster.local:8080")
.get("/greeting").willReturn(success().body("greeting"))),
dsl(service(RequestFieldMatcher
.newRegexMatcher("(kubernetes.docker.internal).*"))
.post("/api/v1/namespaces/test/services").anyBody()
.willReturn(success().body(
json(buildService("service-a", 8080, "test"))))
.get("/api/v1/namespaces/test/services/service-a")
.willReturn(success().body(
json(buildService("service-a", 8080, "test"))))));
String response = restTemplate.getForObject("http://service-a/greeting",
String.class);
String.class);
Assertions.assertNotNull(response);
Assertions.assertEquals("greeting", response);
}
private Service buildService(String name, int port, String namespace) {
return new ServiceBuilder()
.withNewMetadata()
.withName(name)
.withNamespace(namespace)
.withLabels(new HashMap<>())
.withAnnotations(new HashMap<>())
.endMetadata()
.withNewSpec()
.addNewPort()
.withPort(port)
.endPort()
.endSpec()
.build();
return new ServiceBuilder().withNewMetadata().withName(name)
.withNamespace(namespace).withLabels(new HashMap<>())
.withAnnotations(new HashMap<>()).endMetadata().withNewSpec().addNewPort()
.withPort(port).endPort().endSpec().build();
}
}