Skip to content

Commit 6452efe

Browse files
wind57wind57
committed
simpler
1 parent f2f9d31 commit 6452efe

File tree

13 files changed

+20
-20
lines changed

13 files changed

+20
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ private static void manifests(Phase phase) {
279279
ClusterRoleBinding clusterRoleBinding = Serialization.unmarshal(getAdminRole(), ClusterRoleBinding.class);
280280
if (phase.equals(Phase.CREATE)) {
281281
client.rbac().clusterRoleBindings().resource(clusterRoleBinding).create();
282-
util.createAndWait(NAMESPACE, IMAGE_NAME, deployment, discoveryService, ingress, true);
283-
util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true);
282+
util.createAndWait(NAMESPACE, deployment, discoveryService, ingress, true);
283+
util.createAndWait(NAMESPACE, null, externalServiceName, null, true);
284284
}
285285
else {
286286
client.rbac().clusterRoleBindings().resource(clusterRoleBinding).delete();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private static void appManifests(Phase phase) {
128128
Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class);
129129

130130
if (phase.equals(Phase.CREATE)) {
131-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
131+
util.createAndWait(NAMESPACE, deployment, service, ingress, true);
132132
}
133133
else {
134134
util.deleteAndWait(NAMESPACE, deployment, service, ingress);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ private static void manifests(Phase phase) {
386386
util.createAndWait("right", rightConfigMap, null);
387387
util.createAndWait("right", rightWithLabelConfigMap, null);
388388
util.createAndWait(NAMESPACE, configMap, secret);
389-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
389+
util.createAndWait(NAMESPACE, deployment, service, ingress, true);
390390
}
391391
else {
392392
util.deleteAndWait("left", leftConfigMap, null);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private static void app(Phase phase) {
224224
V1Ingress ingress = (V1Ingress) util.yaml("app/watcher-ingress.yaml");
225225

226226
if (phase.equals(Phase.CREATE)) {
227-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
227+
util.createAndWait(NAMESPACE, deployment, service, ingress, true);
228228
}
229229
else if (phase.equals(Phase.DELETE)) {
230230
util.deleteAndWait(NAMESPACE, deployment, service, ingress);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private static void configWatcher(Phase phase) {
172172

173173
if (phase.equals(Phase.CREATE)) {
174174
util.createAndWait(NAMESPACE, configMap, null);
175-
util.createAndWait(NAMESPACE, null, deployment, service, null, true);
175+
util.createAndWait(NAMESPACE, deployment, service, null, true);
176176
}
177177
else {
178178
util.deleteAndWait(NAMESPACE, configMap, null);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ private static void configWatcher(Phase phase) {
216216

217217
if (phase.equals(Phase.CREATE)) {
218218
util.createAndWait(DEFAULT_NAMESPACE, configMap, null);
219-
util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, null, true);
219+
util.createAndWait(DEFAULT_NAMESPACE, deployment, service, null, true);
220220
}
221221
else {
222222
util.deleteAndWait(DEFAULT_NAMESPACE, configMap, null);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ private static void discoveryClient(Phase phase) {
286286
V1Ingress ingress = (V1Ingress) util.yaml("ingress.yaml");
287287

288288
if (phase.equals(Phase.CREATE)) {
289-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
289+
util.createAndWait(NAMESPACE, deployment, service, ingress, true);
290290
}
291291
else {
292292
util.deleteAndWait(NAMESPACE, deployment, service, ingress);
@@ -299,7 +299,7 @@ private static void discoveryServer(Phase phase) {
299299
V1Service service = (V1Service) util.yaml("server/spring-cloud-kubernetes-discoveryserver-service.yaml");
300300

301301
if (phase.equals(Phase.CREATE)) {
302-
util.createAndWait(NAMESPACE, null, deployment, service, null, true);
302+
util.createAndWait(NAMESPACE, deployment, service, null, true);
303303
}
304304
else {
305305
util.deleteAndWait(NAMESPACE, deployment, service, null);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ private static void manifests(Phase phase) {
488488
envVars.add(commonsLevel);
489489
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
490490

491-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
492-
util.createAndWait(NAMESPACE, null, null, externalNameService, null, true);
491+
util.createAndWait(NAMESPACE, deployment, service, ingress, true);
492+
util.createAndWait(NAMESPACE, null, externalNameService, null, true);
493493
}
494494

495495
}

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private static void manifests(Phase phase) {
271271
envVars.add(debugLevel);
272272
envVars.add(selectiveNamespaceA);
273273
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
274-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
274+
util.createAndWait(NAMESPACE, deployment, service, ingress, true);
275275
}
276276
}
277277

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private void appA(Phase phase) {
163163
.yaml("ingress/spring-cloud-kubernetes-configuration-watcher-multiple-apps-ingress.yaml");
164164

165165
if (phase.equals(Phase.CREATE)) {
166-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
166+
util.createAndWait(NAMESPACE, deployment, service, ingress, true);
167167
}
168168
else if (phase.equals(Phase.DELETE)) {
169169
util.deleteAndWait(NAMESPACE, deployment, service, ingress);
@@ -175,7 +175,7 @@ private void appB(Phase phase) {
175175
V1Service service = (V1Service) util.yaml("app-b/app-b-service.yaml");
176176

177177
if (phase.equals(Phase.CREATE)) {
178-
util.createAndWait(NAMESPACE, null, deployment, service, null, true);
178+
util.createAndWait(NAMESPACE, deployment, service, null, true);
179179
}
180180
else if (phase.equals(Phase.DELETE)) {
181181
util.deleteAndWait(NAMESPACE, deployment, service, null);
@@ -189,7 +189,7 @@ private void configWatcher(Phase phase) {
189189
.yaml("config-watcher/spring-cloud-kubernetes-configuration-watcher-service.yaml");
190190

191191
if (phase.equals(Phase.CREATE)) {
192-
util.createAndWait(NAMESPACE, null, deployment, service, null, true);
192+
util.createAndWait(NAMESPACE, deployment, service, null, true);
193193
}
194194
else if (phase.equals(Phase.DELETE)) {
195195
util.deleteAndWait(NAMESPACE, deployment, service, null);

0 commit comments

Comments
 (0)