Skip to content

Commit 0e0a8ff

Browse files
wind57wind57
authored
Align fabric8 integration tests to the newest version (#1166)
1 parent 9862e24 commit 0e0a8ff

File tree

17 files changed

+48
-39
lines changed

17 files changed

+48
-39
lines changed

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@ private void deployBusyboxManifests() throws Exception {
210210
Commons.pullImage(image[0], image[1], K3S);
211211
Commons.loadImage(image[0], image[1], "busybox", K3S);
212212

213-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
213+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
214214
busyboxDeploymentName = deployment.getMetadata().getName();
215215

216216
Service busyboxService = client.services().load(getBusyboxService()).get();
217217
busyboxServiceName = busyboxService.getMetadata().getName();
218-
client.services().inNamespace(NAMESPACE).create(busyboxService);
218+
client.services().inNamespace(NAMESPACE).resource(busyboxService).create();
219219

220220
Fabric8Utils.waitForDeployment(client, busyboxDeploymentName, NAMESPACE, 2, 600);
221221

@@ -230,18 +230,18 @@ private static void deployApp(boolean useEndpointSlices) {
230230
String currentImage = appDeployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
231231
appDeployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version);
232232

233-
client.apps().deployments().inNamespace(NAMESPACE).create(appDeployment);
233+
client.apps().deployments().inNamespace(NAMESPACE).resource(appDeployment).create();
234234
appDeploymentName = appDeployment.getMetadata().getName();
235235

236236
Service appService = client.services().load(getAppService()).get();
237237
appServiceName = appService.getMetadata().getName();
238-
client.services().inNamespace(NAMESPACE).create(appService);
238+
client.services().inNamespace(NAMESPACE).resource(appService).create();
239239

240240
Fabric8Utils.waitForDeployment(client, appDeploymentName, NAMESPACE, 2, 600);
241241

242242
Ingress appIngress = client.network().v1().ingresses().load(getAppIngress()).get();
243243
appIngressName = appIngress.getMetadata().getName();
244-
client.network().v1().ingresses().inNamespace(NAMESPACE).create(appIngress);
244+
client.network().v1().ingresses().inNamespace(NAMESPACE).resource(appIngress).create();
245245

246246
Fabric8Utils.waitForIngress(client, appIngressName, NAMESPACE);
247247

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111

1212
<logger name="org.testcontainers" level="INFO"/>
1313
<logger name="com.github.dockerjava" level="WARN"/>
14+
<logger name="io.fabric8.kubernetes.client" level="ERROR"/>
1415
</configuration>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111

1212
<logger name="org.testcontainers" level="INFO"/>
1313
<logger name="com.github.dockerjava" level="WARN"/>
14+
<logger name="io.fabric8.kubernetes.client" level="ERROR"/>
1415
</configuration>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111

1212
<logger name="org.testcontainers" level="INFO"/>
1313
<logger name="com.github.dockerjava" level="WARN"/>
14+
<logger name="io.fabric8.kubernetes.client" level="ERROR"/>
1415
</configuration>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,24 @@ private static void deployManifests() {
110110

111111
ConfigMap configMap = client.configMaps().load(getConfigMap()).get();
112112
configMapName = configMap.getMetadata().getName();
113-
client.configMaps().create(configMap);
113+
client.configMaps().resource(configMap).create();
114114

115115
Deployment deployment = client.apps().deployments().load(getDeployment()).get();
116116

117117
String version = K8SUtils.getPomVersion();
118118
String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
119119
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version);
120120

121-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
121+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
122122
deploymentName = deployment.getMetadata().getName();
123123

124124
Service service = client.services().load(getService()).get();
125125
serviceName = service.getMetadata().getName();
126-
client.services().inNamespace(NAMESPACE).create(service);
126+
client.services().inNamespace(NAMESPACE).resource(service).create();
127127

128128
Ingress ingress = client.network().v1().ingresses().load(getIngress()).get();
129129
ingressName = ingress.getMetadata().getName();
130-
client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress);
130+
client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create();
131131

132132
Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-configmap-deployment",
133133
NAMESPACE, 2, 600);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111

1212
<logger name="org.testcontainers" level="INFO"/>
1313
<logger name="com.github.dockerjava" level="WARN"/>
14+
<logger name="io.fabric8.kubernetes.client" level="ERROR"/>
1415
</configuration>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,16 @@ private static void deployManifests() {
131131
String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
132132
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version);
133133

134-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
134+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
135135
deploymentName = deployment.getMetadata().getName();
136136

137137
Service service = client.services().load(getService()).get();
138138
serviceName = service.getMetadata().getName();
139-
client.services().inNamespace(NAMESPACE).create(service);
139+
client.services().inNamespace(NAMESPACE).resource(service).create();
140140

141141
Ingress ingress = client.network().v1().ingresses().load(getIngress()).get();
142142
ingressName = ingress.getMetadata().getName();
143-
client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress);
143+
client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create();
144144

145145
Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-discovery-deployment",
146146
NAMESPACE, 2, 600);
@@ -160,13 +160,13 @@ private static void deployMockManifests() {
160160
String[] image = K8SUtils.getImageFromDeployment(deployment).split(":");
161161
Commons.pullImage(image[0], image[1], K3S);
162162
Commons.loadImage(image[0], image[1], "wiremock", K3S);
163-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
163+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
164164
mockDeploymentName = deployment.getMetadata().getName();
165165
mockDeploymentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
166166

167167
Service service = client.services().load(getMockService()).get();
168168
mockServiceName = service.getMetadata().getName();
169-
client.services().inNamespace(NAMESPACE).create(service);
169+
client.services().inNamespace(NAMESPACE).resource(service).create();
170170

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

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,18 @@ private static void deployManifests() {
159159

160160
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(env);
161161

162-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
162+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
163163
deploymentName = deployment.getMetadata().getName();
164164

165165
Service service = client.services().load(getService()).get();
166166
serviceName = service.getMetadata().getName();
167-
client.services().inNamespace(NAMESPACE).create(service);
167+
client.services().inNamespace(NAMESPACE).resource(service).create();
168168

169169
Ingress ingress = client.network().v1().ingresses().load(getIngress()).get();
170170
ingressName = ingress.getMetadata().getName();
171-
client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress);
171+
client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create();
172172

173-
client.rbac().clusterRoleBindings().create(client.rbac().clusterRoleBindings().load(getAdminRole()).get());
173+
client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get()).create();
174174

175175
Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-discovery-deployment",
176176
NAMESPACE, 2, 600);
@@ -201,19 +201,19 @@ private static void deployInMockInNamespace(String namespace) throws Exception {
201201
meta.setName(namespace);
202202
meta.setNamespace(namespace);
203203
namespaceDef.setMetadata(meta);
204-
client.namespaces().create(namespaceDef);
204+
client.namespaces().resource(namespaceDef).create();
205205

206206
Deployment deployment = client.apps().deployments().load(getMockDeployment()).get();
207207
String[] image = K8SUtils.getImageFromDeployment(deployment).split(":");
208208
Commons.pullImage(image[0], image[1], K3S);
209209
Commons.loadImage(image[0], image[1], "wiremock", K3S);
210-
client.apps().deployments().inNamespace(namespace).create(deployment);
210+
client.apps().deployments().inNamespace(namespace).resource(deployment).create();
211211
mockDeploymentName = deployment.getMetadata().getName();
212212
mockDeploymentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
213213

214214
Service service = client.services().load(getMockService()).get();
215215
mockServiceName = service.getMetadata().getName();
216-
client.services().inNamespace(namespace).create(service);
216+
client.services().inNamespace(namespace).resource(service).create();
217217

218218
Fabric8Utils.waitForDeployment(client, "wiremock-deployment", namespace, 2, 600);
219219
}

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111

1212
<logger name="org.testcontainers" level="INFO"/>
1313
<logger name="com.github.dockerjava" level="WARN"/>
14+
<logger name="io.fabric8.kubernetes.client" level="ERROR"/>
1415
</configuration>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,16 @@ private static void deployServiceManifests() {
158158
String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
159159
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version);
160160

161-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
161+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
162162
deploymentName = deployment.getMetadata().getName();
163163

164164
Service service = client.services().load(getService()).get();
165165
serviceName = service.getMetadata().getName();
166-
client.services().inNamespace(NAMESPACE).create(service);
166+
client.services().inNamespace(NAMESPACE).resource(service).create();
167167

168168
Ingress ingress = client.network().v1().ingresses().load(getIngress()).get();
169169
ingressName = ingress.getMetadata().getName();
170-
client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress);
170+
client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create();
171171

172172
Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-loadbalancer-deployment",
173173
NAMESPACE, 2, 600);
@@ -189,16 +189,16 @@ private static void deployPodManifests() {
189189
String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage();
190190
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version);
191191

192-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
192+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
193193
deploymentName = deployment.getMetadata().getName();
194194

195195
Service service = client.services().load(getService()).get();
196196
serviceName = service.getMetadata().getName();
197-
client.services().inNamespace(NAMESPACE).create(service);
197+
client.services().inNamespace(NAMESPACE).resource(service).create();
198198

199199
Ingress ingress = client.network().v1().ingresses().load(getIngress()).get();
200200
ingressName = ingress.getMetadata().getName();
201-
client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress);
201+
client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create();
202202

203203
Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-loadbalancer-deployment",
204204
NAMESPACE, 2, 600);
@@ -218,12 +218,12 @@ private static void deployMockManifests() {
218218
String[] image = K8SUtils.getImageFromDeployment(deployment).split(":");
219219
Commons.pullImage(image[0], image[1], K3S);
220220
Commons.loadImage(image[0], image[1], "wiremock", K3S);
221-
client.apps().deployments().inNamespace(NAMESPACE).create(deployment);
221+
client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create();
222222
mockDeploymentName = deployment.getMetadata().getName();
223223

224224
Service service = client.services().load(getMockService()).get();
225225
mockServiceName = service.getMetadata().getName();
226-
client.services().inNamespace(NAMESPACE).create(service);
226+
client.services().inNamespace(NAMESPACE).resource(service).create();
227227

228228
Ingress ingress = client.network().v1().ingresses().load(getMockIngress()).get();
229229
mockIngressName = ingress.getMetadata().getName();

0 commit comments

Comments
 (0)