refactor: move JKubeKit Helm module to a top-level directory

Signed-off-by: Marc Nuri <[email protected]>

Author: manusa

gradle-plugin/kubernetes/pom.xml

@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jkube</groupId>
-            <artifactId>jkube-kit-resource-helm</artifactId>
+            <artifactId>jkube-kit-helm</artifactId>
             <version>${jkube.kit.version}</version>
         </dependency>
         <dependency>

jkube-kit/config/service/pom.xml

@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jkube</groupId>
-            <artifactId>jkube-kit-resource-helm</artifactId>
+            <artifactId>jkube-kit-helm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

jkube-kit/resource/helm/pom.xml renamed to jkube-kit/helm/pom.xml

@@ -21,12 +21,12 @@
     <groupId>org.eclipse.jkube</groupId>
     <artifactId>jkube-kit-parent</artifactId>
     <version>1.16-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>jkube-kit-resource-helm</artifactId>
+  <artifactId>jkube-kit-helm</artifactId>
 
-  <name>JKube Kit :: Resource :: Helm</name>
+  <name>JKube Kit :: Helm</name>
 
   <dependencies>
 

jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ArtifactoryHelmRepositoryUploader.java renamed to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ArtifactoryHelmRepositoryUploader.java

@@ -271,7 +271,7 @@
 
       <dependency>
         <groupId>org.eclipse.jkube</groupId>
-        <artifactId>jkube-kit-resource-helm</artifactId>
+        <artifactId>jkube-kit-helm</artifactId>
         <version>${project.version}</version>
       </dependency>
 

jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/BadUploadException.java renamed to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/BadUploadException.java

@@ -51,8 +51,8 @@
       <module>enricher/generic</module>
       <module>enricher/specific</module>
       <module>profile</module>
+      <module>helm</module>
       <module>resource/service</module>
-      <module>resource/helm</module>
       <module>watcher/api</module>
       <module>watcher/standard</module>
       <module>remote-dev</module>

jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/Chart.java renamed to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/Chart.java

@@ -63,7 +63,7 @@
 
       <dependency>
         <groupId>org.eclipse.jkube</groupId>
-        <artifactId>jkube-kit-resource-helm</artifactId>
+        <artifactId>jkube-kit-helm</artifactId>
       </dependency>
 
       <dependency>

jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ChartMuseumHelmRepositoryUploader.java renamed to jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/ChartMuseumHelmRepositoryUploader.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<HasMetadata> entities) throws InterruptedException {
+    protected void applyEntities(final KubernetesClient kubernetes, String fileName, final Collection<HasMetadata> entities) {
         applyService.applyEntities(fileName, entities);
     }