feat: support kube-version in install and template command (#278)

Author: Melchior01

README.md

@@ -124,6 +124,8 @@ Release result = installCommand
   .withNamespace("namespace")
   // Optionally create the namespace if not present
   .createNamespace()
+  // Optionally, specify the kubernetes version
+  .withKubeVersion("1.21.0")
   // Optionally, if set, the installation process deletes the installation on failure
   .atomic()
   // Optionally specify a custom description for the release
@@ -594,6 +596,8 @@ String result = templateCommand
   .withVersion("^1.0.0")
   // Optionally specify the Kubernetes namespace for the release
   .withNamespace("namespace")
+  // Optionally, specify the kubernetes version
+  .withKubeVersion("1.21.0")
   // Optionally update dependencies if they are missing before installing the chart
   .dependencyUpdate()
   // Optionally set values for the chart

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

@@ -43,6 +43,7 @@ public class InstallCommand extends HelmCommand<Release> {
   private String version;
   private String chart;
   private String namespace;
+  private String kubeVersion;
   private boolean atomic;
   private boolean createNamespace;
   private String description;
@@ -88,6 +89,7 @@ public Release call() {
       version,
       chart,
       namespace,
+      kubeVersion,
       toInt(atomic),
       toInt(createNamespace),
       description,
@@ -184,6 +186,17 @@ public InstallCommand withNamespace(String namespace) {
     return this;
   }
 
+  /**
+   * Kubernetes version for this request.
+   *
+   * @param kubeVersion the Kubernetes version for this request.
+   * @return this {@link InstallCommand} instance.
+   */
+  public InstallCommand withKubeVersion(String kubeVersion) {
+    this.kubeVersion = kubeVersion;
+    return this;
+  }
+
   /**
    * Create the release namespace if not present.
    *

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

@@ -36,6 +36,7 @@ public class TemplateCommand extends HelmCommand<String> {
   private String version;
   private String chart;
   private String namespace;
+  private String kubeVersion;
   private boolean dependencyUpdate;
   private boolean skipCrds;
   private final Map<String, String> values;
@@ -67,6 +68,7 @@ public String call() {
       version,
       chart,
       namespace,
+      kubeVersion,
       toInt(dependencyUpdate),
       toInt(skipCrds),
       urlEncode(values),
@@ -130,6 +132,17 @@ public TemplateCommand withNamespace(String namespace) {
     return this;
   }
 
+  /**
+   * Kubernetes version for this request.
+   *
+   * @param kubeVersion the Kubernetes version for this request.
+   * @return this {@link TemplateCommand} instance.
+   */
+  public TemplateCommand withKubeVersion(String kubeVersion) {
+    this.kubeVersion = kubeVersion;
+    return this;
+  }
+
   /**
    * Update dependencies if they are missing before rendering the chart.
    *

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

@@ -32,6 +32,7 @@
   "version",
   "chart",
   "namespace",
+  "kubeVersion",
   "atomic",
   "createNamespace",
   "description",
@@ -65,6 +66,7 @@ public class InstallOptions extends Structure {
   public String version;
   public String chart;
   public String namespace;
+  public String kubeVersion;
   public int atomic;
   public int createNamespace;
   public String description;
@@ -97,6 +99,7 @@ public InstallOptions(
     String version,
     String chart,
     String namespace,
+    String kubeVersion,
     int atomic,
     int createNamespace,
     String description,
@@ -128,6 +131,7 @@ public InstallOptions(
     this.version = version;
     this.chart = chart;
     this.namespace = namespace;
+    this.kubeVersion = kubeVersion;
     this.atomic = atomic;
     this.createNamespace = createNamespace;
     this.description = description;

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

@@ -28,6 +28,7 @@
   "version",
   "chart",
   "namespace",
+  "kubeVersion",
   "dependencyUpdate",
   "skipCRDs",
   "values",
@@ -46,6 +47,7 @@ public class TemplateOptions extends Structure {
   public String version;
   public String chart;
   public String namespace;
+  public String kubeVersion;
   public int dependencyUpdate;
   public int skipCRDs;
   public String values;
@@ -64,6 +66,7 @@ public TemplateOptions(
     String version,
     String chart,
     String namespace,
+    String kubeVersion,
     int dependencyUpdate,
     int skipCRDs,
     String values,
@@ -81,6 +84,7 @@ public TemplateOptions(
     this.version = version;
     this.chart = chart;
     this.namespace = namespace;
+    this.kubeVersion = kubeVersion;
     this.dependencyUpdate = dependencyUpdate;
     this.skipCRDs = skipCRDs;
     this.values = values;

native/internal/helm/install.go

@@ -24,6 +24,7 @@ import (
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/cli/values"
 	"helm.sh/helm/v3/pkg/getter"
@@ -45,6 +46,7 @@ type InstallOptions struct {
 	Version                  string
 	Chart                    string
 	Namespace                string
+	KubeVersion              string
 	Atomic                   bool
 	CreateNamespace          bool
 	Description              string
@@ -125,6 +127,9 @@ func install(options *InstallOptions) (*release.Release, *installOutputs, error)
 	}
 	client.ReleaseName = name
 	client.Namespace = options.Namespace
+	if options.KubeVersion != "" {
+	    client.KubeVersion, err = chartutil.ParseKubeVersion(options.KubeVersion)
+	}
 	client.Atomic = options.Atomic
 	client.CreateNamespace = options.CreateNamespace
 	client.Description = options.Description

native/internal/helm/template.go

@@ -28,6 +28,7 @@ type TemplateOptions struct {
 	Version          string
 	Chart            string
 	Namespace        string
+	KubeVersion      string
 	DependencyUpdate bool
 	SkipCRDs         bool
 	Values           string
@@ -51,6 +52,7 @@ func Template(options *TemplateOptions) (string, error) {
 		Version:          options.Version,
 		Chart:            options.Chart,
 		Namespace:        options.Namespace,
+		KubeVersion:      options.KubeVersion,
 		DependencyUpdate: options.DependencyUpdate,
 		SkipCRDs:         options.SkipCRDs,
 		Values:           options.Values,

native/main.go

@@ -47,6 +47,7 @@ struct InstallOptions {
 	char* version;
 	char* chart;
 	char* namespace;
+	char* kubeVersion;
 	int   atomic;
 	int   createNamespace;
 	char* description;
@@ -169,6 +170,7 @@ struct TemplateOptions {
 	char* version;
 	char* chart;
 	char* namespace;
+	char* kubeVersion;
 	int   dependencyUpdate;
 	int   skipCRDs;
 	char* values;
@@ -348,6 +350,7 @@ func Install(options *C.struct_InstallOptions) C.Result {
 			Version:                  C.GoString(options.version),
 			Chart:                    C.GoString(options.chart),
 			Namespace:                C.GoString(options.namespace),
+			KubeVersion:              C.GoString(options.kubeVersion),
 			Atomic:                   options.atomic == 1,
 			CreateNamespace:          options.createNamespace == 1,
 			Description:              C.GoString(options.description),
@@ -610,6 +613,7 @@ func Template(options *C.struct_TemplateOptions) C.Result {
 			Version:          C.GoString(options.version),
 			Chart:            C.GoString(options.chart),
 			Namespace:        C.GoString(options.namespace),
+			KubeVersion:      C.GoString(options.kubeVersion),
 			DependencyUpdate: options.dependencyUpdate == 1,
 			SkipCRDs:         options.skipCRDs == 1,
 			Values:           C.GoString(options.values),