Remove not needed resource classes + correct readiness check

pom.xml

@@ -291,7 +291,6 @@
             <modules>
                 <module>test-frame-common</module>
                 <module>test-frame-kubernetes</module>
-                <module>test-frame-openshift</module>
                 <module>test-frame-test</module>
                 <module>test-frame-metrics-collector</module>
             </modules>
@@ -304,7 +303,6 @@
             <modules>
                 <module>test-frame-common</module>
                 <module>test-frame-kubernetes</module>
-                <module>test-frame-openshift</module>
                 <module>test-frame-metrics-collector</module>
             </modules>
             <properties>
@@ -366,7 +364,6 @@
                                     <descriptors>
                                         <descriptor>test-frame-common/src/main/assembly/dist.xml</descriptor>
                                         <descriptor>test-frame-kubernetes/src/main/assembly/dist.xml</descriptor>
-                                        <descriptor>test-frame-openshift/src/main/assembly/dist.xml</descriptor>
                                         <descriptor>test-frame-metrics-collector/src/main/assembly/dist.xml</descriptor>
                                     </descriptors>
                                 </configuration>

test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java

@@ -15,7 +15,14 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
+import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Node;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.ReplicationController;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
+import io.fabric8.kubernetes.api.model.apps.StatefulSet;
 import io.skodjob.testframe.LoggerUtils;
 import io.skodjob.testframe.TestFrameConstants;
 import io.skodjob.testframe.TestFrameEnv;
@@ -244,11 +251,10 @@ private <T extends HasMetadata> void createOrUpdateResource(boolean waitReady,
                 }
                 if (waitReady) {
                     assertTrue(waitResourceCondition(resource, new ResourceCondition<>(p -> {
-                        try {
+                        if (isResourceWithReadiness(resource)) {
                             return client.getClient().resource(resource).isReady();
-                        } catch (Exception ex) {
-                            return client.getClient().resource(resource) != null;
                         }
+                        return client.getClient().resource(resource) != null;
                     }, "ready")),
                             String.format("Timed out waiting for %s/%s in %s to be ready", resource.getKind(),
                                     resource.getMetadata().getName(), resource.getMetadata().getNamespace()));
@@ -425,4 +431,15 @@ private <T extends HasMetadata> ResourceType<T> findResourceType(T resource) {
         }
         return null;
     }
+
+    private <T extends HasMetadata> boolean isResourceWithReadiness(T resource) {
+        return resource instanceof Deployment
+            || resource instanceof io.fabric8.kubernetes.api.model.extensions.Deployment
+            || resource instanceof ReplicaSet
+            || resource instanceof Pod
+            || resource instanceof ReplicationController
+            || resource instanceof Endpoints
+            || resource instanceof Node
+            || resource instanceof StatefulSet;
+    }
 }