Merge pull request #7005 from EricLemieux/capabilities-helmversion

Add HelmVersion to Capabilities

pkg/chartutil/capabilities.go

@@ -20,6 +20,8 @@ import (
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+
+	helmversion "helm.sh/helm/v3/internal/version"
 )
 
 var (
@@ -34,6 +36,7 @@ var (
 			Minor:   "18",
 		},
 		APIVersions: DefaultVersionSet,
+		HelmVersion: helmversion.Get(),
 	}
 )
 
@@ -43,6 +46,8 @@ type Capabilities struct {
 	KubeVersion KubeVersion
 	// APIversions are supported Kubernetes API versions.
 	APIVersions VersionSet
+	// HelmVersion is the build information for this helm version
+	HelmVersion helmversion.BuildInfo
 }
 
 // KubeVersion is the Kubernetes version.

pkg/chartutil/capabilities_test.go

@@ -58,3 +58,11 @@ func TestDefaultCapabilities(t *testing.T) {
 		t.Errorf("Expected default KubeVersion.Minor to be 16, got %q", kv.Minor)
 	}
 }
+
+func TestDefaultCapabilitiesHelmVersion(t *testing.T) {
+	hv := DefaultCapabilities.HelmVersion
+
+	if hv.Version != "v3.2" {
+		t.Errorf("Expected default HelmVerison to be v3.2, got %q", hv.Version)
+	}
+}