fix 22606

Signed-off-by: sivchari <[email protected]>

Author: sivchari

reposerver/repository/repository.go

@@ -1096,7 +1096,7 @@ func helmTemplate(appPath string, repoRoot string, env *v1alpha1.Env, q *apiclie
 	templateOpts := &helm.TemplateOpts{
 		Name:        appName,
 		Namespace:   q.ApplicationSource.GetNamespaceOrDefault(q.Namespace),
-		KubeVersion: text.SemVer(q.ApplicationSource.GetKubeVersionOrDefault(q.KubeVersion)),
+		KubeVersion: q.ApplicationSource.GetKubeVersionOrDefault(q.KubeVersion),
 		APIVersions: q.ApplicationSource.GetAPIVersionsOrDefault(q.ApiVersions),
 		Set:         map[string]string{},
 		SetString:   map[string]string{},

util/helm/helm_test.go

@@ -219,6 +219,29 @@ func TestAPIVersions(t *testing.T) {
 	assert.Equal(t, "sample/v2", objs[0].GetAPIVersion())
 }
 
+func TestIssue22606(t *testing.T) {
+	h, err := NewHelmApp("./testdata/tests", nil, false, "", "", "", false)
+	require.NoError(t, err)
+
+	objs, err := template(h, &TemplateOpts{KubeVersion: "1.30.11+IKS"})
+	require.NoError(t, err)
+	require.Len(t, objs, 2)
+
+	for _, obj := range objs {
+		if obj.GetKind() != "ConfigMap" {
+			continue
+		}
+		var configMap corev1.ConfigMap
+		err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &configMap)
+		require.NoError(t, err)
+		if data, ok := configMap.Data["kubeVersion"]; ok {
+			assert.Equal(t, "v1.30.11+IKS", data)
+			return
+		}
+		t.Fatal("expected kubeVersion key not found in configMap")
+	}
+}
+
 func TestSkipCrds(t *testing.T) {
 	h, err := NewHelmApp("./testdata/crds", nil, false, "", "", "", false)
 	require.NoError(t, err)
@@ -242,11 +265,11 @@ func TestSkipTests(t *testing.T) {
 
 	objs, err := template(h, &TemplateOpts{SkipTests: false})
 	require.NoError(t, err)
-	require.Len(t, objs, 1)
+	require.Len(t, objs, 2)
 
 	objs, err = template(h, &TemplateOpts{})
 	require.NoError(t, err)
-	require.Len(t, objs, 1)
+	require.Len(t, objs, 2)
 
 	objs, err = template(h, &TemplateOpts{SkipTests: true})
 	require.NoError(t, err)

util/helm/testdata/tests/templates/tests/test-map.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-map
+  annotations:
+    "helm.sh/hook": test
+data:
+  kubeVersion: {{.Capabilities.KubeVersion}}