From 61a931318872a5e757fd527b593987f9ab487954 Mon Sep 17 00:00:00 2001 From: David Kornel Date: Wed, 21 Feb 2024 14:18:48 +0100 Subject: [PATCH] Reorganize packages to new root Signed-off-by: David Kornel --- .../io/skodjob/{ => testframe}/clients/KubeClient.java | 2 +- .../interfaces/NamespacedResourceType.java | 2 +- .../skodjob/{ => testframe}/interfaces/ResourceType.java | 2 +- .../main/java/io/skodjob/{ => testframe}/wait/Wait.java | 2 +- .../io/skodjob/{ => testframe}/wait/WaitException.java | 2 +- .../resources/ClusterRoleBindingResource.java | 6 +++--- .../{ => testframe}/resources/ClusterRoleResource.java | 6 +++--- .../{ => testframe}/resources/ConfigMapResource.java | 6 +++--- .../resources/CustomResourceDefinitionResource.java | 6 +++--- .../{ => testframe}/resources/DeploymentResource.java | 6 +++--- .../io/skodjob/{ => testframe}/resources/JobResource.java | 6 +++--- .../skodjob/{ => testframe}/resources/LeaseResource.java | 6 +++--- .../{ => testframe}/resources/NamespaceResource.java | 8 +++----- .../{ => testframe}/resources/NetworkPolicyResource.java | 6 +++--- .../{ => testframe}/resources/RoleBindingResource.java | 6 +++--- .../skodjob/{ => testframe}/resources/RoleResource.java | 6 +++--- .../skodjob/{ => testframe}/resources/SecretResource.java | 6 +++--- .../{ => testframe}/resources/ServiceAccountResource.java | 6 +++--- .../{ => testframe}/resources/ServiceResource.java | 6 +++--- .../resources/ValidatingWebhookConfigurationResource.java | 6 +++--- .../{ => testframe}/resources/OperatorGroupResource.java | 6 +++--- .../{ => testframe}/resources/SubscriptionResource.java | 6 +++--- 22 files changed, 56 insertions(+), 58 deletions(-) rename test-frame-common/src/main/java/io/skodjob/{ => testframe}/clients/KubeClient.java (95%) rename test-frame-common/src/main/java/io/skodjob/{ => testframe}/interfaces/NamespacedResourceType.java (97%) rename test-frame-common/src/main/java/io/skodjob/{ => testframe}/interfaces/ResourceType.java (98%) rename test-frame-common/src/main/java/io/skodjob/{ => testframe}/wait/Wait.java (99%) rename test-frame-common/src/main/java/io/skodjob/{ => testframe}/wait/WaitException.java (78%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/ClusterRoleBindingResource.java (95%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/ClusterRoleResource.java (95%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/ConfigMapResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/CustomResourceDefinitionResource.java (95%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/DeploymentResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/JobResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/LeaseResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/NamespaceResource.java (93%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/NetworkPolicyResource.java (97%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/RoleBindingResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/RoleResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/SecretResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/ServiceAccountResource.java (97%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/ServiceResource.java (96%) rename test-frame-kubernetes/src/main/java/io/skodjob/{ => testframe}/resources/ValidatingWebhookConfigurationResource.java (96%) rename test-frame-openshift/src/main/java/io/skodjob/{ => testframe}/resources/OperatorGroupResource.java (97%) rename test-frame-openshift/src/main/java/io/skodjob/{ => testframe}/resources/SubscriptionResource.java (97%) diff --git a/test-frame-common/src/main/java/io/skodjob/clients/KubeClient.java b/test-frame-common/src/main/java/io/skodjob/testframe/clients/KubeClient.java similarity index 95% rename from test-frame-common/src/main/java/io/skodjob/clients/KubeClient.java rename to test-frame-common/src/main/java/io/skodjob/testframe/clients/KubeClient.java index 73d7cff..6ee3dfa 100644 --- a/test-frame-common/src/main/java/io/skodjob/clients/KubeClient.java +++ b/test-frame-common/src/main/java/io/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/test-frame-common/src/main/java/io/skodjob/interfaces/NamespacedResourceType.java b/test-frame-common/src/main/java/io/skodjob/testframe/interfaces/NamespacedResourceType.java similarity index 97% rename from test-frame-common/src/main/java/io/skodjob/interfaces/NamespacedResourceType.java rename to test-frame-common/src/main/java/io/skodjob/testframe/interfaces/NamespacedResourceType.java index 6e11d52..d96c770 100644 --- a/test-frame-common/src/main/java/io/skodjob/interfaces/NamespacedResourceType.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/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/test-frame-common/src/main/java/io/skodjob/interfaces/ResourceType.java b/test-frame-common/src/main/java/io/skodjob/testframe/interfaces/ResourceType.java similarity index 98% rename from test-frame-common/src/main/java/io/skodjob/interfaces/ResourceType.java rename to test-frame-common/src/main/java/io/skodjob/testframe/interfaces/ResourceType.java index 4110849..25b8c14 100644 --- a/test-frame-common/src/main/java/io/skodjob/interfaces/ResourceType.java +++ b/test-frame-common/src/main/java/io/skodjob/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/test-frame-common/src/main/java/io/skodjob/wait/Wait.java b/test-frame-common/src/main/java/io/skodjob/testframe/wait/Wait.java similarity index 99% rename from test-frame-common/src/main/java/io/skodjob/wait/Wait.java rename to test-frame-common/src/main/java/io/skodjob/testframe/wait/Wait.java index fd5b07a..dd4a9b7 100644 --- a/test-frame-common/src/main/java/io/skodjob/wait/Wait.java +++ b/test-frame-common/src/main/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/test-frame-common/src/main/java/io/skodjob/wait/WaitException.java b/test-frame-common/src/main/java/io/skodjob/testframe/wait/WaitException.java similarity index 78% rename from test-frame-common/src/main/java/io/skodjob/wait/WaitException.java rename to test-frame-common/src/main/java/io/skodjob/testframe/wait/WaitException.java index 3fe8c8d..0b6cb96 100644 --- a/test-frame-common/src/main/java/io/skodjob/wait/WaitException.java +++ b/test-frame-common/src/main/java/io/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/ClusterRoleBindingResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleBindingResource.java similarity index 95% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/ClusterRoleBindingResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleBindingResource.java index 8450d1f..8b83f6e 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/ClusterRoleBindingResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/ClusterRoleResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleResource.java similarity index 95% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/ClusterRoleResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleResource.java index c43c2d5..32f8cce 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/ClusterRoleResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/ConfigMapResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ConfigMapResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/ConfigMapResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ConfigMapResource.java index 5710de3..e5bf221 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/ConfigMapResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/CustomResourceDefinitionResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/CustomResourceDefinitionResource.java similarity index 95% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/CustomResourceDefinitionResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/CustomResourceDefinitionResource.java index b673356..bc676a4 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/CustomResourceDefinitionResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/DeploymentResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/DeploymentResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/DeploymentResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/DeploymentResource.java index 6db9f2a..ed8a3f2 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/DeploymentResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/JobResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/JobResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/JobResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/JobResource.java index e9c4fea..810d864 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/JobResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/LeaseResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/LeaseResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/LeaseResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/LeaseResource.java index 42f2e65..97968c6 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/LeaseResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/NamespaceResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NamespaceResource.java similarity index 93% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/NamespaceResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NamespaceResource.java index 59fa2c3..f250df8 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/NamespaceResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/NetworkPolicyResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NetworkPolicyResource.java similarity index 97% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/NetworkPolicyResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NetworkPolicyResource.java index 8e211ee..6e3e6d0 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/NetworkPolicyResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/RoleBindingResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleBindingResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/RoleBindingResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleBindingResource.java index a6d0bc6..2c6d64e 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/RoleBindingResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/RoleResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/RoleResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleResource.java index 391f2ed..d6b6deb 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/RoleResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/SecretResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/SecretResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/SecretResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/SecretResource.java index 7f6c633..860479e 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/SecretResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/ServiceAccountResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceAccountResource.java similarity index 97% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/ServiceAccountResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceAccountResource.java index 0cbb648..8a5e813 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/ServiceAccountResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/ServiceResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/ServiceResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceResource.java index 3e2381c..e69e0b8 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/ServiceResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/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/test-frame-kubernetes/src/main/java/io/skodjob/resources/ValidatingWebhookConfigurationResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ValidatingWebhookConfigurationResource.java similarity index 96% rename from test-frame-kubernetes/src/main/java/io/skodjob/resources/ValidatingWebhookConfigurationResource.java rename to test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ValidatingWebhookConfigurationResource.java index 64fc70f..41aec3d 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/resources/ValidatingWebhookConfigurationResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ValidatingWebhookConfigurationResource.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/test-frame-openshift/src/main/java/io/skodjob/resources/OperatorGroupResource.java b/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/OperatorGroupResource.java similarity index 97% rename from test-frame-openshift/src/main/java/io/skodjob/resources/OperatorGroupResource.java rename to test-frame-openshift/src/main/java/io/skodjob/testframe/resources/OperatorGroupResource.java index 13ec205..01679af 100644 --- a/test-frame-openshift/src/main/java/io/skodjob/resources/OperatorGroupResource.java +++ b/test-frame-openshift/src/main/java/io/skodjob/testframe/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/test-frame-openshift/src/main/java/io/skodjob/resources/SubscriptionResource.java b/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/SubscriptionResource.java similarity index 97% rename from test-frame-openshift/src/main/java/io/skodjob/resources/SubscriptionResource.java rename to test-frame-openshift/src/main/java/io/skodjob/testframe/resources/SubscriptionResource.java index c613cb6..372c17b 100644 --- a/test-frame-openshift/src/main/java/io/skodjob/resources/SubscriptionResource.java +++ b/test-frame-openshift/src/main/java/io/skodjob/testframe/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;