Skip to content

Commit 93c651d

Browse files
wind57wind57
authored
fix (#1159)
1 parent bc1de6f commit 93c651d

File tree

6 files changed

+37
-31
lines changed

6 files changed

+37
-31
lines changed

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ class DiscoveryClientFilterNamespaceIT {
8383

8484
private static final String NAMESPACE = "default";
8585

86-
private static final String NAMESPACE_LEFT = "left-namespace";
86+
private static final String NAMESPACE_LEFT = "left-namespace-k8s-client";
8787

88-
private static final String NAMESPACE_RIGHT = "right-namespace";
88+
private static final String NAMESPACE_RIGHT = "right-namespace-k8s-client";
8989

9090
private static CoreV1Api api;
9191

@@ -178,7 +178,10 @@ private void cleanup() throws ApiException {
178178
networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE_LEFT, null, null, null, null, null, null);
179179
networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE_RIGHT, null, null, null, null, null, null);
180180

181-
authApi.deleteClusterRole("cluster-admin", null, null, null, null, null, null);
181+
authApi.deleteClusterRoleBinding("admin-default-k8s-client", null, null, null, null, null, null);
182+
183+
api.deleteNamespace(NAMESPACE_LEFT, null, null, null, null, null, null);
184+
api.deleteNamespace(NAMESPACE_RIGHT, null, null, null, null, null, null);
182185

183186
}
184187

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/resources/namespace-filter/cluster-admin-serviceaccount-role.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
4-
creationTimestamp: null
5-
name: admin-default
4+
name: admin-default-k8s-client
65
roleRef:
76
apiGroup: rbac.authorization.k8s.io
87
kind: ClusterRole

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void test() {
100100
Assertions.assertEquals(result.size(), 3);
101101
Assertions.assertTrue(result.contains("kubernetes"));
102102
Assertions.assertTrue(result.contains("spring-cloud-kubernetes-fabric8-client-discovery"));
103-
Assertions.assertTrue(result.contains("servicea-wiremock"));
103+
Assertions.assertTrue(result.contains("wiremock"));
104104
}
105105

106106
private static void deleteManifests() {
@@ -168,7 +168,7 @@ private static void deployMockManifests() {
168168
mockServiceName = service.getMetadata().getName();
169169
client.services().inNamespace(NAMESPACE).create(service);
170170

171-
Fabric8Utils.waitForDeployment(client, "servicea-wiremock-deployment", NAMESPACE, 2, 600);
171+
Fabric8Utils.waitForDeployment(client, "wiremock-deployment", NAMESPACE, 2, 600);
172172

173173
}
174174
catch (Exception e) {
@@ -190,11 +190,11 @@ private static InputStream getIngress() {
190190
}
191191

192192
private static InputStream getMockService() {
193-
return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-service.yaml");
193+
return Fabric8Utils.inputStream("wiremock/wiremock-service.yaml");
194194
}
195195

196196
private static InputStream getMockDeployment() {
197-
return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-deployment.yaml");
197+
return Fabric8Utils.inputStream("wiremock/wiremock-deployment.yaml");
198198
}
199199

200200
private WebClient.Builder builder() {

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ class Fabric8DiscoveryNamespaceFilterIT {
5555

5656
private static final String NAMESPACE = "default";
5757

58-
private static final String NAMESPACE_1 = "namespace1";
58+
private static final String NAMESPACE_LEFT = "namespace-left";
5959

60-
private static final String NAMESPACE_2 = "namespace2";
60+
private static final String NAMESPACE_RIGHT = "namespace-right";
6161

6262
private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-discovery";
6363

@@ -107,16 +107,16 @@ void test() {
107107
.retryWhen(retrySpec()).block();
108108

109109
Assertions.assertEquals(services.size(), 1);
110-
Assertions.assertTrue(services.contains("servicea-wiremock"));
110+
Assertions.assertTrue(services.contains("wiremock"));
111111

112-
WebClient clientEndpoints = builder().baseUrl("localhost/endpoints/servicea-wiremock").build();
112+
WebClient clientEndpoints = builder().baseUrl("localhost/endpoints/wiremock").build();
113113

114114
List<Endpoints> endpoints = clientEndpoints.method(HttpMethod.GET).retrieve()
115115
.bodyToMono(new ParameterizedTypeReference<List<Endpoints>>() {
116116
}).retryWhen(retrySpec()).block();
117117

118118
Assertions.assertEquals(endpoints.size(), 1);
119-
Assertions.assertEquals(endpoints.get(0).getMetadata().getNamespace(), NAMESPACE_1);
119+
Assertions.assertEquals(endpoints.get(0).getMetadata().getNamespace(), NAMESPACE_LEFT);
120120

121121
}
122122

@@ -128,11 +128,15 @@ private static void deleteManifests() {
128128
client.services().inNamespace(NAMESPACE).withName(serviceName).delete();
129129
client.network().v1().ingresses().inNamespace(NAMESPACE).withName(ingressName).delete();
130130

131-
client.services().inNamespace(NAMESPACE_1).withName(mockServiceName).delete();
132-
client.apps().deployments().inNamespace(NAMESPACE_1).withName(mockDeploymentName).delete();
131+
client.services().inNamespace(NAMESPACE_LEFT).withName(mockServiceName).delete();
132+
client.apps().deployments().inNamespace(NAMESPACE_LEFT).withName(mockDeploymentName).delete();
133133

134-
client.services().inNamespace(NAMESPACE_2).withName(mockServiceName).delete();
135-
client.apps().deployments().inNamespace(NAMESPACE_2).withName(mockDeploymentName).delete();
134+
client.services().inNamespace(NAMESPACE_RIGHT).withName(mockServiceName).delete();
135+
client.apps().deployments().inNamespace(NAMESPACE_RIGHT).withName(mockDeploymentName).delete();
136+
137+
client.rbac().clusterRoleBindings().withName("admin-default").delete();
138+
client.namespaces().withName(NAMESPACE_LEFT).delete();
139+
client.namespaces().withName(NAMESPACE_RIGHT).delete();
136140

137141
}
138142
catch (Exception e) {
@@ -151,7 +155,7 @@ private static void deployManifests() {
151155
String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
152156
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version);
153157
List<EnvVar> env = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv();
154-
env.add(new EnvVar("JAVA_OPTS", "-Dspring.cloud.kubernetes.discovery.namespaces[0]=" + NAMESPACE_1, null));
158+
env.add(new EnvVar("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0", NAMESPACE_LEFT, null));
155159

156160
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(env);
157161

@@ -181,8 +185,8 @@ private static void deployManifests() {
181185
private static void deployMockManifests() {
182186

183187
try {
184-
deployInMockInNamespace(NAMESPACE_1);
185-
deployInMockInNamespace(NAMESPACE_2);
188+
deployInMockInNamespace(NAMESPACE_LEFT);
189+
deployInMockInNamespace(NAMESPACE_RIGHT);
186190
}
187191
catch (Exception e) {
188192
throw new RuntimeException(e);
@@ -211,7 +215,7 @@ private static void deployInMockInNamespace(String namespace) throws Exception {
211215
mockServiceName = service.getMetadata().getName();
212216
client.services().inNamespace(namespace).create(service);
213217

214-
Fabric8Utils.waitForDeployment(client, "servicea-wiremock-deployment", namespace, 2, 600);
218+
Fabric8Utils.waitForDeployment(client, "wiremock-deployment", namespace, 2, 600);
215219
}
216220

217221
private static InputStream getService() {
@@ -231,11 +235,11 @@ private static InputStream getIngress() {
231235
}
232236

233237
private static InputStream getMockService() {
234-
return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-service.yaml");
238+
return Fabric8Utils.inputStream("wiremock/wiremock-service.yaml");
235239
}
236240

237241
private static InputStream getMockDeployment() {
238-
return Fabric8Utils.inputStream("wiremock/fabric8-discovery-wiremock-deployment.yaml");
242+
return Fabric8Utils.inputStream("wiremock/wiremock-deployment.yaml");
239243
}
240244

241245
private WebClient.Builder builder() {

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-deployment.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: servicea-wiremock-deployment
4+
name: wiremock-deployment
55
spec:
66
selector:
77
matchLabels:
8-
app: servicea-wiremock
8+
app: wiremock
99
template:
1010
metadata:
1111
labels:
12-
app: servicea-wiremock
12+
app: wiremock
1313
spec:
1414
containers:
15-
- name: servicea-wiremock
15+
- name: wiremock
1616
image: wiremock/wiremock:2.32.0
1717
imagePullPolicy: IfNotPresent
1818
readinessProbe:

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/fabric8-discovery-wiremock-service.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/wiremock/wiremock-service.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
labels:
5-
app: servicea-wiremock
6-
name: servicea-wiremock
5+
app: wiremock
6+
name: wiremock
77
spec:
88
ports:
99
- name: http
1010
port: 8080
1111
targetPort: 8080
1212
selector:
13-
app: servicea-wiremock
13+
app: wiremock
1414
type: ClusterIP

0 commit comments

Comments
 (0)