feat: add support for --skip-crds flag (#317)

Author: afalhambra-hivemq

helm-java/src/main/java/com/marcnuri/helm/InstallCommand.java

@@ -50,6 +50,7 @@ public class InstallCommand extends HelmCommand<Release> {
   private boolean disableOpenApiValidation;
   private boolean dryRun;
   private DryRun dryRunOption;
+  private boolean skipCrds;
   private boolean wait;
   private int timeout;
   private final Map<String, String> values;
@@ -94,6 +95,7 @@ public Release call() {
       toInt(disableOpenApiValidation),
       toInt(dryRun),
       dryRunOption == null ? null : dryRunOption.name().toLowerCase(Locale.ROOT),
+      toInt(skipCrds),
       toInt(wait),
       timeout,
       urlEncode(values),
@@ -267,6 +269,18 @@ public InstallCommand withDryRunOption(DryRun dryRunOption) {
     return this;
   }
 
+  /**
+   * Skip CRDs during installation.
+   * <p>
+   * If set, no CRDs will be installed. By default, CRDs are installed if not already present.
+   *
+   * @return this {@link InstallCommand} instance.
+   */
+  public InstallCommand skipCrds() {
+    this.skipCrds = true;
+    return this;
+  }
+
   /**
    * Waits until all Pods are in a ready state, PVCs are bound, Deployments have minimum
    * (Desired minus maxUnavailable) Pods in ready state and Services have an IP address

helm-java/src/main/java/com/marcnuri/helm/TemplateCommand.java

@@ -36,6 +36,7 @@ public class TemplateCommand extends HelmCommand<String> {
   private String chart;
   private String namespace;
   private boolean dependencyUpdate;
+  private boolean skipCrds;
   private final Map<String, String> values;
   private final List<Path> valuesFiles;
   private Path certFile;
@@ -66,6 +67,7 @@ public String call() {
       chart,
       namespace,
       toInt(dependencyUpdate),
+      toInt(skipCrds),
       urlEncode(values),
       toString(valuesFiles),
       toString(certFile),
@@ -137,6 +139,18 @@ public TemplateCommand dependencyUpdate() {
     return this;
   }
 
+  /**
+   * Skip CRDs during template rendering.
+   * <p>
+   * If set, no CRDs will be included in the rendered templates.
+   *
+   * @return this {@link TemplateCommand} instance.
+   */
+  public TemplateCommand skipCrds() {
+    this.skipCrds = true;
+    return this;
+  }
+
   /**
    * Set values for the chart.
    *

helm-java/src/main/java/com/marcnuri/helm/UpgradeCommand.java

@@ -54,6 +54,7 @@ public class UpgradeCommand extends HelmCommand<Release> {
   private boolean disableOpenApiValidation;
   private boolean dryRun;
   private DryRun dryRunOption;
+  private boolean skipCrds;
   private boolean wait;
   private int timeout;
   private final Map<String, String> values;
@@ -102,6 +103,7 @@ public Release call() {
       toInt(disableOpenApiValidation),
       toInt(dryRun),
       dryRunOption == null ? null : dryRunOption.name().toLowerCase(Locale.ROOT),
+      toInt(skipCrds),
       toInt(wait),
       timeout,
       urlEncode(values),
@@ -319,6 +321,18 @@ public UpgradeCommand withDryRunOption(DryRun dryRunOption) {
     return this;
   }
 
+  /**
+   * Skip CRDs during upgrade.
+   * <p>
+   * If set, no CRDs will be installed or upgraded. By default, CRDs are installed if not already present.
+   *
+   * @return this {@link UpgradeCommand} instance.
+   */
+  public UpgradeCommand skipCrds() {
+    this.skipCrds = true;
+    return this;
+  }
+
   /**
    * Waits until all Pods are in a ready state, PVCs are bound, Deployments have minimum
    * (Desired minus maxUnavailable) Pods in ready state and Services have an IP address

helm-java/src/test/java/com/marcnuri/helm/HelmInstallTest.java

@@ -228,6 +228,19 @@ void withDisableOpenApiValidation() {
         .hasFieldOrPropertyWithValue("name", "test")
         .hasFieldOrPropertyWithValue("status", "deployed");
     }
+
+    @Test
+    void skipCrds() {
+      final Release result = helm.install()
+        .clientOnly()
+        .debug()
+        .withName("test-skip-crds")
+        .skipCrds()
+        .call();
+      assertThat(result)
+        .returns("test-skip-crds", Release::getName)
+        .returns("deployed", Release::getStatus);
+    }
   }
 
   @Nested

helm-java/src/test/java/com/marcnuri/helm/HelmKubernetesTest.java

@@ -555,6 +555,19 @@ void withWaitAndCustomTimeout() {
             "beginning wait for 3 resources with timeout of 5m30s"
           );
       }
+
+      @Test
+      void skipCrds() {
+        helm.install().withName("upgrade-skip-crds").withKubeConfig(kubeConfigFile).call();
+        final Release result = helm.upgrade()
+          .withKubeConfig(kubeConfigFile)
+          .withName("upgrade-skip-crds")
+          .skipCrds()
+          .call();
+        assertThat(result)
+          .returns("2", Release::getRevision)
+          .returns("deployed", Release::getStatus);
+      }
     }
 
     @Nested

helm-java/src/test/java/com/marcnuri/helm/HelmTemplateTest.java

@@ -107,6 +107,15 @@ void withInvalidValuesAndDebug() {
         .hasMessageContaining("# Source: local-chart-test")
         .hasMessageContaining("name: release-name-local-chart-test");
     }
+
+    @Test
+    void skipCrds() {
+      final String result = helm.template()
+        .skipCrds()
+        .call();
+      assertThat(result)
+        .contains("name: release-name-local-chart-test");
+    }
   }
 
   @Nested

lib/api/src/main/java/com/marcnuri/helm/jni/InstallOptions.java

@@ -39,6 +39,7 @@
   "disableOpenApiValidation",
   "dryRun",
   "dryRunOption",
+  "skipCRDs",
   "wait",
   "timeout",
   "values",
@@ -71,6 +72,7 @@ public class InstallOptions extends Structure {
   public int disableOpenApiValidation;
   public int dryRun;
   public String dryRunOption;
+  public int skipCRDs;
   public int wait;
   public int timeout;
   public String values;
@@ -102,6 +104,7 @@ public InstallOptions(
     int disableOpenApiValidation,
     int dryRun,
     String dryRunOption,
+    int skipCRDs,
     int wait,
     int timeout,
     String values,
@@ -132,6 +135,7 @@ public InstallOptions(
     this.disableOpenApiValidation = disableOpenApiValidation;
     this.dryRun = dryRun;
     this.dryRunOption = dryRunOption;
+    this.skipCRDs = skipCRDs;
     this.wait = wait;
     this.timeout = timeout;
     this.values = values;

lib/api/src/main/java/com/marcnuri/helm/jni/TemplateOptions.java

@@ -28,6 +28,7 @@
   "chart",
   "namespace",
   "dependencyUpdate",
+  "skipCRDs",
   "values",
   "valuesFiles",
   "certFile",
@@ -45,6 +46,7 @@ public class TemplateOptions extends Structure {
   public String chart;
   public String namespace;
   public int dependencyUpdate;
+  public int skipCRDs;
   public String values;
   public String valuesFiles;
   public String certFile;
@@ -62,6 +64,7 @@ public TemplateOptions(
     String chart,
     String namespace,
     int dependencyUpdate,
+    int skipCRDs,
     String values,
     String valuesFiles,
     String certFile,
@@ -78,6 +81,7 @@ public TemplateOptions(
     this.chart = chart;
     this.namespace = namespace;
     this.dependencyUpdate = dependencyUpdate;
+    this.skipCRDs = skipCRDs;
     this.values = values;
     this.valuesFiles = valuesFiles;
     this.certFile = certFile;

lib/api/src/main/java/com/marcnuri/helm/jni/UpgradeOptions.java

@@ -43,6 +43,7 @@
   "disableOpenApiValidation",
   "dryRun",
   "dryRunOption",
+  "skipCRDs",
   "wait",
   "timeout",
   "values",
@@ -78,6 +79,7 @@ public class UpgradeOptions extends Structure {
   public int disableOpenApiValidation;
   public int dryRun;
   public String dryRunOption;
+  public int skipCRDs;
   public int wait;
   public int timeout;
   public String values;
@@ -113,6 +115,7 @@ public UpgradeOptions(
     int disableOpenApiValidation,
     int dryRun,
     String dryRunOption,
+    int skipCRDs,
     int wait,
     int timeout,
     String values,
@@ -147,6 +150,7 @@ public UpgradeOptions(
     this.disableOpenApiValidation = disableOpenApiValidation;
     this.dryRun = dryRun;
     this.dryRunOption = dryRunOption;
+    this.skipCRDs = skipCRDs;
     this.wait = wait;
     this.timeout = timeout;
     this.values = values;

native/internal/helm/install.go

@@ -53,6 +53,7 @@ type InstallOptions struct {
 	DisableOpenApiValidation bool
 	DryRun                   bool
 	DryRunOption             string
+	SkipCRDs                 bool
 	Wait                     bool
 	Timeout                  time.Duration
 	Values                   string
@@ -130,6 +131,7 @@ func install(options *InstallOptions) (*release.Release, *installOutputs, error)
 	client.Devel = options.Devel
 	client.DryRun = options.DryRun
 	client.DryRunOption = dryRunOption(options.DryRunOption)
+	client.SkipCRDs = options.SkipCRDs
 	client.Wait = options.Wait
 	client.Timeout = options.Timeout
 	client.ClientOnly = options.ClientOnly