Skip to content

Commit 3090ac4

Browse files
authored
Merge pull request #50989 from LarsSven/ls/new-fabric-method
Use upstream readiness check for Kubernetes
2 parents f31f937 + 3e008ae commit 3090ac4

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@
4444
import com.github.dockerjava.api.DockerClient;
4545
import com.github.dockerjava.api.command.InspectContainerResponse;
4646

47-
import io.fabric8.kubernetes.api.model.*;
48-
import io.fabric8.kubernetes.api.model.apps.Deployment;
49-
import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
50-
import io.fabric8.kubernetes.api.model.apps.StatefulSet;
51-
import io.fabric8.kubernetes.client.*;
47+
import io.fabric8.kubernetes.api.model.HasMetadata;
5248
import io.fabric8.kubernetes.client.Config;
49+
import io.fabric8.kubernetes.client.KubernetesClient;
50+
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
51+
import io.fabric8.kubernetes.client.readiness.Readiness;
5352
import io.quarkus.deployment.Feature;
5453
import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
5554
import io.quarkus.deployment.annotations.BuildProducer;
@@ -218,7 +217,7 @@ public void applyManifests(
218217
resources.forEach(resource -> {
219218
client.resource(resource).create();
220219

221-
if (isReadinessApplicable(resource)) {
220+
if (Readiness.getInstance().isReadinessApplicable(resource)) {
222221
resourcesWithReadiness.add(resource);
223222
}
224223
});
@@ -242,17 +241,6 @@ public void applyManifests(
242241
}
243242
}
244243

245-
private boolean isReadinessApplicable(HasMetadata item) {
246-
return (item instanceof Deployment ||
247-
item instanceof io.fabric8.kubernetes.api.model.extensions.Deployment ||
248-
item instanceof ReplicaSet ||
249-
item instanceof Pod ||
250-
item instanceof ReplicationController ||
251-
item instanceof Endpoints ||
252-
item instanceof Node ||
253-
item instanceof StatefulSet);
254-
}
255-
256244
private InputStream getManifestStream(String manifestPath) throws IOException {
257245
try {
258246
URL url = new URL(manifestPath);

0 commit comments

Comments
 (0)