From 4e18def154f63ef3271acef7efc7fe153e6eb817 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Tue, 30 Jan 2024 09:49:41 +0100 Subject: [PATCH] refactor: move JKubeKit Helm module to a top-level directory Signed-off-by: Marc Nuri --- gradle-plugin/kubernetes/pom.xml | 2 +- jkube-kit/config/service/pom.xml | 2 +- jkube-kit/{resource => }/helm/pom.xml | 6 +++--- .../resource/helm/ArtifactoryHelmRepositoryUploader.java | 0 .../eclipse/jkube/kit/resource/helm/BadUploadException.java | 0 .../java/org/eclipse/jkube/kit/resource/helm/Chart.java | 0 .../resource/helm/ChartMuseumHelmRepositoryUploader.java | 0 .../jkube/kit/resource/helm/GeneratedChartListener.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmConfig.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmDependency.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmParameter.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmRepository.java | 0 .../kit/resource/helm/HelmRepositoryConnectionUtils.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmService.java | 0 .../eclipse/jkube/kit/resource/helm/HelmServiceUtil.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmUploader.java | 0 .../jkube/kit/resource/helm/HelmUploaderManager.java | 0 .../kit/resource/helm/NexusHelmRepositoryUploader.java | 0 .../jkube/kit/resource/helm/StandardRepositoryUploader.java | 0 .../eclipse/jkube/kit/resource/helm/oci/OCIManifest.java | 0 .../jkube/kit/resource/helm/oci/OCIManifestLayer.java | 0 .../jkube/kit/resource/helm/oci/OCIRegistryClient.java | 0 .../jkube/kit/resource/helm/oci/OCIRegistryEndpoint.java | 0 .../jkube/kit/resource/helm/oci/OCIRegistryInterceptor.java | 0 .../jkube/kit/resource/helm/oci/OCIRepositoryUploader.java | 0 .../helm/src/main/resources/META-INF/jkube/helm-uploaders | 0 .../java/org/eclipse/jkube/kit/resource/helm/ChartTest.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmConfigTest.java | 0 .../eclipse/jkube/kit/resource/helm/HelmDependencyTest.java | 0 .../eclipse/jkube/kit/resource/helm/HelmParameterTest.java | 0 .../eclipse/jkube/kit/resource/helm/HelmRepositoryTest.java | 0 .../org/eclipse/jkube/kit/resource/helm/HelmServiceIT.java | 0 .../eclipse/jkube/kit/resource/helm/HelmServiceTest.java | 0 .../jkube/kit/resource/helm/HelmServiceUploadIT.java | 0 .../jkube/kit/resource/helm/HelmServiceUtilTest.java | 0 .../jkube/kit/resource/helm/HelmUploaderManagerTest.java | 0 .../jkube/kit/resource/helm/TestMockResponseProvider.java | 0 .../jkube/kit/resource/helm/oci/OCIManifestLayerTest.java | 0 .../jkube/kit/resource/helm/oci/OCIManifestTest.java | 0 .../jkube/kit/resource/helm/oci/OCIRegistryClientTest.java | 0 .../kit/resource/helm/oci/OCIRegistryEndpointTest.java | 0 .../kit/resource/helm/oci/OCIRegistryInterceptorTest.java | 0 .../kit/resource/helm/oci/OCIRepositoryUploaderTest.java | 0 .../resources/invalid-helm-chart-fragment/Chart.helm.yaml | 0 .../resources/invalid-helm-values-fragment/values.helm.yaml | 0 .../src/test/resources/it/expected/kubernetes/Chart.yaml | 0 .../it/expected/kubernetes/templates/kubernetes.yaml | 0 .../src/test/resources/it/expected/kubernetes/values.yaml | 0 .../src/test/resources/it/expected/openshift/Chart.yaml | 0 .../it/expected/openshift/templates/openshift.yaml | 0 .../resources/it/expected/openshift/templates/test-pod.yaml | 0 .../src/test/resources/it/expected/openshift/values.yaml | 0 .../helm/src/test/resources/it/sources/additional-file.txt | 0 .../helm/src/test/resources/it/sources/global-template.yml | 0 .../src/test/resources/it/sources/kubernetes/kubernetes.yml | 0 .../src/test/resources/it/sources/openshift/openshift.yml | 0 .../test/resources/it/sources/openshift/some-template.yml | 0 .../mockito-extensions/org.mockito.plugins.MockMaker | 0 .../helm/src/test/resources/test-oci-manifest.json | 0 .../src/test/resources/valid-helm-fragments/Chart.helm.yaml | 0 .../test/resources/valid-helm-fragments/values.helm.yaml | 0 jkube-kit/parent/pom.xml | 2 +- jkube-kit/pom.xml | 2 +- kubernetes-maven-plugin/plugin/pom.xml | 2 +- .../eclipse/jkube/maven/plugin/mojo/build/ApplyMojo.java | 4 +--- 65 files changed, 9 insertions(+), 11 deletions(-) rename jkube-kit/{resource => }/helm/pom.xml (94%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ArtifactoryHelmRepositoryUploader.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/BadUploadException.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/Chart.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ChartMuseumHelmRepositoryUploader.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/GeneratedChartListener.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmConfig.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmDependency.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmParameter.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepository.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmService.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploader.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManager.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/NexusHelmRepositoryUploader.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/StandardRepositoryUploader.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifest.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayer.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClient.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpoint.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptor.java (100%) rename jkube-kit/{resource => }/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploader.java (100%) rename jkube-kit/{resource => }/helm/src/main/resources/META-INF/jkube/helm-uploaders (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/ChartTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmConfigTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmDependencyTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmParameterTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceIT.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUploadIT.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtilTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManagerTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/TestMockResponseProvider.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayerTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClientTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpointTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploaderTest.java (100%) rename jkube-kit/{resource => }/helm/src/test/resources/invalid-helm-chart-fragment/Chart.helm.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/invalid-helm-values-fragment/values.helm.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/expected/kubernetes/Chart.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/expected/kubernetes/templates/kubernetes.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/expected/kubernetes/values.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/expected/openshift/Chart.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/expected/openshift/templates/openshift.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/expected/openshift/templates/test-pod.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/expected/openshift/values.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/sources/additional-file.txt (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/sources/global-template.yml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/sources/kubernetes/kubernetes.yml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/sources/openshift/openshift.yml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/it/sources/openshift/some-template.yml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) rename jkube-kit/{resource => }/helm/src/test/resources/test-oci-manifest.json (100%) rename jkube-kit/{resource => }/helm/src/test/resources/valid-helm-fragments/Chart.helm.yaml (100%) rename jkube-kit/{resource => }/helm/src/test/resources/valid-helm-fragments/values.helm.yaml (100%) diff --git a/gradle-plugin/kubernetes/pom.xml b/gradle-plugin/kubernetes/pom.xml index 606ef25806..adb611d124 100644 --- a/gradle-plugin/kubernetes/pom.xml +++ b/gradle-plugin/kubernetes/pom.xml @@ -64,7 +64,7 @@ org.eclipse.jkube - jkube-kit-resource-helm + jkube-kit-helm ${jkube.kit.version} diff --git a/jkube-kit/config/service/pom.xml b/jkube-kit/config/service/pom.xml index 065893f25e..7a52f9ccc5 100644 --- a/jkube-kit/config/service/pom.xml +++ b/jkube-kit/config/service/pom.xml @@ -43,7 +43,7 @@ org.eclipse.jkube - jkube-kit-resource-helm + jkube-kit-helm org.projectlombok diff --git a/jkube-kit/resource/helm/pom.xml b/jkube-kit/helm/pom.xml similarity index 94% rename from jkube-kit/resource/helm/pom.xml rename to jkube-kit/helm/pom.xml index dead4337d7..a597e2e784 100644 --- a/jkube-kit/resource/helm/pom.xml +++ b/jkube-kit/helm/pom.xml @@ -21,12 +21,12 @@ org.eclipse.jkube jkube-kit-parent 1.16-SNAPSHOT - ../../parent/pom.xml + ../parent/pom.xml - jkube-kit-resource-helm + jkube-kit-helm - JKube Kit :: Resource :: Helm + JKube Kit :: Helm diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ArtifactoryHelmRepositoryUploader.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ArtifactoryHelmRepositoryUploader.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ArtifactoryHelmRepositoryUploader.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ArtifactoryHelmRepositoryUploader.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/BadUploadException.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/BadUploadException.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/BadUploadException.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/BadUploadException.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/Chart.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/Chart.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/Chart.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/Chart.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ChartMuseumHelmRepositoryUploader.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ChartMuseumHelmRepositoryUploader.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ChartMuseumHelmRepositoryUploader.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ChartMuseumHelmRepositoryUploader.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/GeneratedChartListener.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/GeneratedChartListener.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/GeneratedChartListener.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/GeneratedChartListener.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmConfig.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmConfig.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmConfig.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmConfig.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmDependency.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmDependency.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmDependency.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmDependency.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmParameter.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmParameter.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmParameter.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmParameter.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepository.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepository.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepository.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepository.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryConnectionUtils.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmService.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmService.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmService.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmService.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploader.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploader.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploader.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploader.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManager.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManager.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManager.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManager.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/NexusHelmRepositoryUploader.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/NexusHelmRepositoryUploader.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/NexusHelmRepositoryUploader.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/NexusHelmRepositoryUploader.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/StandardRepositoryUploader.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/StandardRepositoryUploader.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/StandardRepositoryUploader.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/StandardRepositoryUploader.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifest.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifest.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifest.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifest.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayer.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayer.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayer.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayer.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClient.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClient.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClient.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClient.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpoint.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpoint.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpoint.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpoint.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptor.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptor.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptor.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptor.java diff --git a/jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploader.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploader.java similarity index 100% rename from jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploader.java rename to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploader.java diff --git a/jkube-kit/resource/helm/src/main/resources/META-INF/jkube/helm-uploaders b/jkube-kit/helm/src/main/resources/META-INF/jkube/helm-uploaders similarity index 100% rename from jkube-kit/resource/helm/src/main/resources/META-INF/jkube/helm-uploaders rename to jkube-kit/helm/src/main/resources/META-INF/jkube/helm-uploaders diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/ChartTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/ChartTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/ChartTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/ChartTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmConfigTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmConfigTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmConfigTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmConfigTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmDependencyTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmDependencyTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmDependencyTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmDependencyTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmParameterTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmParameterTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmParameterTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmParameterTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmRepositoryTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceIT.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceIT.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceIT.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceIT.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUploadIT.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUploadIT.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUploadIT.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUploadIT.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtilTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtilTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtilTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtilTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManagerTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManagerTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManagerTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/HelmUploaderManagerTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/TestMockResponseProvider.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/TestMockResponseProvider.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/TestMockResponseProvider.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/TestMockResponseProvider.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayerTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayerTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayerTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestLayerTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIManifestTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClientTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClientTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClientTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryClientTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpointTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpointTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpointTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryEndpointTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRegistryInterceptorTest.java diff --git a/jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploaderTest.java b/jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploaderTest.java similarity index 100% rename from jkube-kit/resource/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploaderTest.java rename to jkube-kit/helm/src/test/java/org/eclipse/jkube/kit/resource/helm/oci/OCIRepositoryUploaderTest.java diff --git a/jkube-kit/resource/helm/src/test/resources/invalid-helm-chart-fragment/Chart.helm.yaml b/jkube-kit/helm/src/test/resources/invalid-helm-chart-fragment/Chart.helm.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/invalid-helm-chart-fragment/Chart.helm.yaml rename to jkube-kit/helm/src/test/resources/invalid-helm-chart-fragment/Chart.helm.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/invalid-helm-values-fragment/values.helm.yaml b/jkube-kit/helm/src/test/resources/invalid-helm-values-fragment/values.helm.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/invalid-helm-values-fragment/values.helm.yaml rename to jkube-kit/helm/src/test/resources/invalid-helm-values-fragment/values.helm.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/expected/kubernetes/Chart.yaml b/jkube-kit/helm/src/test/resources/it/expected/kubernetes/Chart.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/expected/kubernetes/Chart.yaml rename to jkube-kit/helm/src/test/resources/it/expected/kubernetes/Chart.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/expected/kubernetes/templates/kubernetes.yaml b/jkube-kit/helm/src/test/resources/it/expected/kubernetes/templates/kubernetes.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/expected/kubernetes/templates/kubernetes.yaml rename to jkube-kit/helm/src/test/resources/it/expected/kubernetes/templates/kubernetes.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/expected/kubernetes/values.yaml b/jkube-kit/helm/src/test/resources/it/expected/kubernetes/values.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/expected/kubernetes/values.yaml rename to jkube-kit/helm/src/test/resources/it/expected/kubernetes/values.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/expected/openshift/Chart.yaml b/jkube-kit/helm/src/test/resources/it/expected/openshift/Chart.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/expected/openshift/Chart.yaml rename to jkube-kit/helm/src/test/resources/it/expected/openshift/Chart.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/expected/openshift/templates/openshift.yaml b/jkube-kit/helm/src/test/resources/it/expected/openshift/templates/openshift.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/expected/openshift/templates/openshift.yaml rename to jkube-kit/helm/src/test/resources/it/expected/openshift/templates/openshift.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/expected/openshift/templates/test-pod.yaml b/jkube-kit/helm/src/test/resources/it/expected/openshift/templates/test-pod.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/expected/openshift/templates/test-pod.yaml rename to jkube-kit/helm/src/test/resources/it/expected/openshift/templates/test-pod.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/expected/openshift/values.yaml b/jkube-kit/helm/src/test/resources/it/expected/openshift/values.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/expected/openshift/values.yaml rename to jkube-kit/helm/src/test/resources/it/expected/openshift/values.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/it/sources/additional-file.txt b/jkube-kit/helm/src/test/resources/it/sources/additional-file.txt similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/sources/additional-file.txt rename to jkube-kit/helm/src/test/resources/it/sources/additional-file.txt diff --git a/jkube-kit/resource/helm/src/test/resources/it/sources/global-template.yml b/jkube-kit/helm/src/test/resources/it/sources/global-template.yml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/sources/global-template.yml rename to jkube-kit/helm/src/test/resources/it/sources/global-template.yml diff --git a/jkube-kit/resource/helm/src/test/resources/it/sources/kubernetes/kubernetes.yml b/jkube-kit/helm/src/test/resources/it/sources/kubernetes/kubernetes.yml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/sources/kubernetes/kubernetes.yml rename to jkube-kit/helm/src/test/resources/it/sources/kubernetes/kubernetes.yml diff --git a/jkube-kit/resource/helm/src/test/resources/it/sources/openshift/openshift.yml b/jkube-kit/helm/src/test/resources/it/sources/openshift/openshift.yml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/sources/openshift/openshift.yml rename to jkube-kit/helm/src/test/resources/it/sources/openshift/openshift.yml diff --git a/jkube-kit/resource/helm/src/test/resources/it/sources/openshift/some-template.yml b/jkube-kit/helm/src/test/resources/it/sources/openshift/some-template.yml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/it/sources/openshift/some-template.yml rename to jkube-kit/helm/src/test/resources/it/sources/openshift/some-template.yml diff --git a/jkube-kit/resource/helm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/jkube-kit/helm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to jkube-kit/helm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/jkube-kit/resource/helm/src/test/resources/test-oci-manifest.json b/jkube-kit/helm/src/test/resources/test-oci-manifest.json similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/test-oci-manifest.json rename to jkube-kit/helm/src/test/resources/test-oci-manifest.json diff --git a/jkube-kit/resource/helm/src/test/resources/valid-helm-fragments/Chart.helm.yaml b/jkube-kit/helm/src/test/resources/valid-helm-fragments/Chart.helm.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/valid-helm-fragments/Chart.helm.yaml rename to jkube-kit/helm/src/test/resources/valid-helm-fragments/Chart.helm.yaml diff --git a/jkube-kit/resource/helm/src/test/resources/valid-helm-fragments/values.helm.yaml b/jkube-kit/helm/src/test/resources/valid-helm-fragments/values.helm.yaml similarity index 100% rename from jkube-kit/resource/helm/src/test/resources/valid-helm-fragments/values.helm.yaml rename to jkube-kit/helm/src/test/resources/valid-helm-fragments/values.helm.yaml diff --git a/jkube-kit/parent/pom.xml b/jkube-kit/parent/pom.xml index a6058066a5..74815950f6 100644 --- a/jkube-kit/parent/pom.xml +++ b/jkube-kit/parent/pom.xml @@ -271,7 +271,7 @@ org.eclipse.jkube - jkube-kit-resource-helm + jkube-kit-helm ${project.version} diff --git a/jkube-kit/pom.xml b/jkube-kit/pom.xml index 2d9c622b4c..ec4bfc835f 100644 --- a/jkube-kit/pom.xml +++ b/jkube-kit/pom.xml @@ -51,8 +51,8 @@ enricher/generic enricher/specific profile + helm resource/service - resource/helm watcher/api watcher/standard remote-dev diff --git a/kubernetes-maven-plugin/plugin/pom.xml b/kubernetes-maven-plugin/plugin/pom.xml index b19b65ecaa..a6e6dae0ff 100644 --- a/kubernetes-maven-plugin/plugin/pom.xml +++ b/kubernetes-maven-plugin/plugin/pom.xml @@ -63,7 +63,7 @@ org.eclipse.jkube - jkube-kit-resource-helm + jkube-kit-helm diff --git a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ApplyMojo.java b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ApplyMojo.java index 20fe8a91bf..10e6b5704a 100644 --- a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ApplyMojo.java +++ b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ApplyMojo.java @@ -181,15 +181,13 @@ public void executeInternal() throws MojoExecutionException { isOpenShift ? "oc" : "kubectl"); } catch (KubernetesClientException e) { KubernetesResourceUtil.handleKubernetesClientException(e, this.log); - } catch(InterruptedException ex) { - Thread.currentThread().interrupt(); } catch (Exception e) { throw new MojoExecutionException(e.getMessage(), e); } } - protected void applyEntities(final KubernetesClient kubernetes, String fileName, final Collection entities) throws InterruptedException { + protected void applyEntities(final KubernetesClient kubernetes, String fileName, final Collection entities) { applyService.applyEntities(fileName, entities); }