From be2b84685af03aeb34b5b7d84960315aec71c270 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 31 Mar 2025 09:21:33 -0700
Subject: [PATCH] cleanup: Remove Helm v2 template lint rules

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/lint/rules/template.go      | 26 +-------------------------
 pkg/lint/rules/template_test.go | 20 --------------------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 287968340..4d421f5bf 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -24,7 +24,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"regexp"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -39,11 +38,6 @@ import (
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
-var (
-	crdHookSearch     = regexp.MustCompile(`"?helm\.sh/hook"?:\s+crd-install`)
-	releaseTimeSearch = regexp.MustCompile(`\.Release\.Time`)
-)
-
 // Templates lints the templates in the Linter.
 func Templates(linter *support.Linter, values map[string]interface{}, namespace string, _ bool) {
 	TemplatesWithKubeVersion(linter, values, namespace, nil)
@@ -119,14 +113,10 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string
 	- Metadata.Namespace is not set
 	*/
 	for _, template := range chart.Templates {
-		fileName, data := template.Name, template.Data
+		fileName := template.Name
 		fpath = fileName
 
 		linter.RunLinterRule(support.ErrorSev, fpath, validateAllowedExtension(fileName))
-		// These are v3 specific checks to make sure and warn people if their
-		// chart is not compatible with v3
-		linter.RunLinterRule(support.WarningSev, fpath, validateNoCRDHooks(data))
-		linter.RunLinterRule(support.ErrorSev, fpath, validateNoReleaseTime(data))
 
 		// We only apply the following lint rules to yaml files
 		if filepath.Ext(fileName) != ".yaml" || filepath.Ext(fileName) == ".yml" {
@@ -291,20 +281,6 @@ func validateMetadataNameFunc(obj *K8sYamlStruct) validation.ValidateNameFunc {
 	}
 }
 
-func validateNoCRDHooks(manifest []byte) error {
-	if crdHookSearch.Match(manifest) {
-		return errors.New("manifest is a crd-install hook. This hook is no longer supported in v3 and all CRDs should also exist the crds/ directory at the top level of the chart")
-	}
-	return nil
-}
-
-func validateNoReleaseTime(manifest []byte) error {
-	if releaseTimeSearch.Match(manifest) {
-		return errors.New(".Release.Time has been removed in v3, please replace with the `now` function in your templates")
-	}
-	return nil
-}
-
 // validateMatchSelector ensures that template specs have a selector declared.
 // See https://github.com/helm/helm/issues/1990
 func validateMatchSelector(yamlStruct *K8sYamlStruct, manifest string) error {
diff --git a/pkg/lint/rules/template_test.go b/pkg/lint/rules/template_test.go
index 7205ace6d..bd503368d 100644
--- a/pkg/lint/rules/template_test.go
+++ b/pkg/lint/rules/template_test.go
@@ -85,26 +85,6 @@ func TestTemplateIntegrationHappyPath(t *testing.T) {
 	}
 }
 
-func TestV3Fail(t *testing.T) {
-	linter := support.Linter{ChartDir: "./testdata/v3-fail"}
-	Templates(&linter, values, namespace, strict)
-	res := linter.Messages
-
-	if len(res) != 3 {
-		t.Fatalf("Expected 3 errors, got %d, %v", len(res), res)
-	}
-
-	if !strings.Contains(res[0].Err.Error(), ".Release.Time has been removed in v3") {
-		t.Errorf("Unexpected error: %s", res[0].Err)
-	}
-	if !strings.Contains(res[1].Err.Error(), "manifest is a crd-install hook") {
-		t.Errorf("Unexpected error: %s", res[1].Err)
-	}
-	if !strings.Contains(res[2].Err.Error(), "manifest is a crd-install hook") {
-		t.Errorf("Unexpected error: %s", res[2].Err)
-	}
-}
-
 func TestMultiTemplateFail(t *testing.T) {
 	linter := support.Linter{ChartDir: "./testdata/multi-template-fail"}
 	Templates(&linter, values, namespace, strict)