Merge pull request #10 from skodjob/reorg-packages

Reorganize packages to new root
skodjob · Feb 21, 2024 · 1458bfd · 1458bfd
2 parents 325342f + 61a9313
commit 1458bfd
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 58 deletions.
diff --git a/...n/java/io/skodjob/clients/KubeClient.java → ...skodjob/testframe/clients/KubeClient.java b/...n/java/io/skodjob/clients/KubeClient.java → ...skodjob/testframe/clients/KubeClient.java
@@ -1,4 +1,4 @@
-package io.skodjob.clients;
+package io.skodjob.testframe.clients;
 
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;

diff --git a/...ob/interfaces/NamespacedResourceType.java → ...me/interfaces/NamespacedResourceType.java b/...ob/interfaces/NamespacedResourceType.java → ...me/interfaces/NamespacedResourceType.java
@@ -1,4 +1,4 @@
-package io.skodjob.interfaces;
+package io.skodjob.testframe.interfaces;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;

diff --git a/...a/io/skodjob/interfaces/ResourceType.java → ...ob/testframe/interfaces/ResourceType.java b/...a/io/skodjob/interfaces/ResourceType.java → ...ob/testframe/interfaces/ResourceType.java
@@ -1,4 +1,4 @@
-package io.skodjob.interfaces;
+package io.skodjob.testframe.interfaces;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;

diff --git a/...n/src/main/java/io/skodjob/wait/Wait.java → .../java/io/skodjob/testframe/wait/Wait.java b/...n/src/main/java/io/skodjob/wait/Wait.java → .../java/io/skodjob/testframe/wait/Wait.java
@@ -1,4 +1,4 @@
-package io.skodjob.wait;
+package io.skodjob.testframe.wait;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

diff --git a/...n/java/io/skodjob/wait/WaitException.java → ...skodjob/testframe/wait/WaitException.java b/...n/java/io/skodjob/wait/WaitException.java → ...skodjob/testframe/wait/WaitException.java
@@ -1,4 +1,4 @@
-package io.skodjob.wait;
+package io.skodjob.testframe.wait;
 
 public class WaitException extends RuntimeException {
     public WaitException(String message) {

diff --git a/...resources/ClusterRoleBindingResource.java → ...resources/ClusterRoleBindingResource.java b/...resources/ClusterRoleBindingResource.java → ...resources/ClusterRoleBindingResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBindingList;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.ResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.ResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...kodjob/resources/ClusterRoleResource.java → ...tframe/resources/ClusterRoleResource.java b/...kodjob/resources/ClusterRoleResource.java → ...tframe/resources/ClusterRoleResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.rbac.ClusterRole;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleList;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.ResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.ResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/.../skodjob/resources/ConfigMapResource.java → ...estframe/resources/ConfigMapResource.java b/.../skodjob/resources/ConfigMapResource.java → ...estframe/resources/ConfigMapResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...ces/CustomResourceDefinitionResource.java → ...ces/CustomResourceDefinitionResource.java b/...ces/CustomResourceDefinitionResource.java → ...ces/CustomResourceDefinitionResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.ResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.ResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...skodjob/resources/DeploymentResource.java → ...stframe/resources/DeploymentResource.java b/...skodjob/resources/DeploymentResource.java → ...stframe/resources/DeploymentResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...ava/io/skodjob/resources/JobResource.java → ...djob/testframe/resources/JobResource.java b/...ava/io/skodjob/resources/JobResource.java → ...djob/testframe/resources/JobResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
 import io.fabric8.kubernetes.api.model.batch.v1.JobList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.ScalableResource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...a/io/skodjob/resources/LeaseResource.java → ...ob/testframe/resources/LeaseResource.java b/...a/io/skodjob/resources/LeaseResource.java → ...ob/testframe/resources/LeaseResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/.../skodjob/resources/NamespaceResource.java → ...estframe/resources/NamespaceResource.java b/.../skodjob/resources/NamespaceResource.java → ...estframe/resources/NamespaceResource.java
@@ -1,14 +1,12 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
-import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.NamespaceList;
 import io.fabric8.kubernetes.api.model.Namespace;
-import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.ResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.ResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...djob/resources/NetworkPolicyResource.java → ...rame/resources/NetworkPolicyResource.java b/...djob/resources/NetworkPolicyResource.java → ...rame/resources/NetworkPolicyResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...kodjob/resources/RoleBindingResource.java → ...tframe/resources/RoleBindingResource.java b/...kodjob/resources/RoleBindingResource.java → ...tframe/resources/RoleBindingResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBindingList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...va/io/skodjob/resources/RoleResource.java → ...job/testframe/resources/RoleResource.java b/...va/io/skodjob/resources/RoleResource.java → ...job/testframe/resources/RoleResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.rbac.Role;
 import io.fabric8.kubernetes.api.model.rbac.RoleList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/.../io/skodjob/resources/SecretResource.java → ...b/testframe/resources/SecretResource.java b/.../io/skodjob/resources/SecretResource.java → ...b/testframe/resources/SecretResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...job/resources/ServiceAccountResource.java → ...ame/resources/ServiceAccountResource.java b/...job/resources/ServiceAccountResource.java → ...ame/resources/ServiceAccountResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.ServiceAccount;
 import io.fabric8.kubernetes.api.model.ServiceAccountList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...io/skodjob/resources/ServiceResource.java → .../testframe/resources/ServiceResource.java b/...io/skodjob/resources/ServiceResource.java → .../testframe/resources/ServiceResource.java
@@ -1,10 +1,10 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...lidatingWebhookConfigurationResource.java → ...lidatingWebhookConfigurationResource.java b/...lidatingWebhookConfigurationResource.java → ...lidatingWebhookConfigurationResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.ResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.ResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...djob/resources/OperatorGroupResource.java → ...rame/resources/OperatorGroupResource.java b/...djob/resources/OperatorGroupResource.java → ...rame/resources/OperatorGroupResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroup;
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroupList;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;
 

diff --git a/...odjob/resources/SubscriptionResource.java → ...frame/resources/SubscriptionResource.java b/...odjob/resources/SubscriptionResource.java → ...frame/resources/SubscriptionResource.java
@@ -1,11 +1,11 @@
-package io.skodjob.resources;
+package io.skodjob.testframe.resources;
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList;
-import io.skodjob.clients.KubeClient;
-import io.skodjob.interfaces.NamespacedResourceType;
+import io.skodjob.testframe.clients.KubeClient;
+import io.skodjob.testframe.interfaces.NamespacedResourceType;
 
 import java.util.function.Consumer;