fix(helm): rename helpers to avoid parent chart collision (#49)

Renames all helper templates from kagent.* to kagent-tools.* prefix to
prevent naming conflicts with the parent kagent chart. When Helm renders
subcharts, template definitions are global, causing the parent chart's
helpers to override the subchart's helpers with the same names.

This fixes:
- Selector label mismatch when using nameOverride (was using parent's
  logic instead of subchart's fullname logic)
- Helm upgrade failures due to immutable selector field changes
- Enables proper use of nameOverride instead of requiring
  fullnameOverride workaround

All helper references updated across all template files:
- _helpers.tpl: Renamed 10 helper definitions
- deployment.yaml, service.yaml, serviceaccount.yaml: Updated references
- clusterrole.yaml, clusterrolebinding.yaml: Updated references
- servicemonitor.yaml, NOTES.txt: Updated references

Backward compatible: existing fullnameOverride usage continues to work.

Signed-off-by: Eitan Yarmush <eitan.yarmush@solo.io>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: EItanya

helm/kagent-tools/templates/NOTES.txt

@@ -3,7 +3,7 @@
 #  This is a Helm chart for Kagent Tools
 #
 #  1. Forward application port by running these commands in the terminal:
-#  kubectl -n {{ include "kagent.namespace" . }} port-forward service/{{ .Release.Name }} {{.Values.service.ports.tools.targetPort}}:{{.Values.service.ports.tools.port}} &
+#  kubectl -n {{ include "kagent-tools.namespace" . }} port-forward service/{{ .Release.Name }} {{.Values.service.ports.tools.targetPort}}:{{.Values.service.ports.tools.port}} &
 #
 #  2. Then visit http://127.0.0.1:{{.Values.service.ports.tools.port}}/mcp to use MCP
 #

helm/kagent-tools/templates/_helpers.tpl

@@ -1,14 +1,14 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "kagent.name" -}}
+{{- define "kagent-tools.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Create a default fully qualified app name.
 */}}
-{{- define "kagent.fullname" -}}
+{{- define "kagent-tools.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -23,16 +23,16 @@ Create a default fully qualified app name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "kagent.chart" -}}
+{{- define "kagent-tools.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "kagent.labels" -}}
-helm.sh/chart: {{ include "kagent.chart" . }}
-{{ include "kagent.selectorLabels" . }}
+{{- define "kagent-tools.labels" -}}
+helm.sh/chart: {{ include "kagent-tools.chart" . }}
+{{ include "kagent-tools.selectorLabels" . }}
 {{- if .Chart.Version }}
 app.kubernetes.io/version: {{ .Chart.Version | quote }}
 {{- end }}
@@ -42,41 +42,41 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "kagent.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "kagent.fullname" . }}
+{{- define "kagent-tools.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kagent-tools.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*Default provider name*/}}
-{{- define "kagent.defaultProviderName" -}}
+{{- define "kagent-tools.defaultProviderName" -}}
 {{ .Values.providers.default | default "openAI" | lower}}
 {{- end }}
 
 {{/*Default model name*/}}
-{{- define "kagent.defaultModelConfigName" -}}
+{{- define "kagent-tools.defaultModelConfigName" -}}
 default-model-config
 {{- end }}
 
 {{/*
 Expand the namespace of the release.
 Allows overriding it for multi-namespace deployments in combined charts.
 */}}
-{{- define "kagent.namespace" -}}
+{{- define "kagent-tools.namespace" -}}
 {{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
 {{- end }}
 
 {{/*
 Service account name: default when useDefaultServiceAccount is true, otherwise the chart fullname.
 */}}
-{{- define "kagent.serviceAccountName" -}}
-{{- if .Values.useDefaultServiceAccount }}default{{- else }}{{ include "kagent.fullname" . }}{{- end }}
+{{- define "kagent-tools.serviceAccountName" -}}
+{{- if .Values.useDefaultServiceAccount }}default{{- else }}{{ include "kagent-tools.fullname" . }}{{- end }}
 {{- end }}
 
 {{/*
 Watch namespaces - transforms list of namespaces cached by the controller into comma-separated string
 Removes duplicates
 */}}
-{{- define "kagent.watchNamespaces" -}}
+{{- define "kagent-tools.watchNamespaces" -}}
 {{- $nsSet := dict }}
 {{- .Values.controller.watchNamespaces | default list | uniq | join "," }}
 {{- end -}}

helm/kagent-tools/templates/clusterrole.yaml

@@ -3,9 +3,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "kagent.fullname" . }}-read-role
+  name: {{ include "kagent-tools.fullname" . }}-read-role
   labels:
-    {{- include "kagent.labels" . | nindent 4 }}
+    {{- include "kagent-tools.labels" . | nindent 4 }}
 rules:
   # Core workload resources
   - apiGroups: [""]
@@ -82,9 +82,9 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "kagent.fullname" . }}-cluster-admin-role
+  name: {{ include "kagent-tools.fullname" . }}-cluster-admin-role
   labels:
-    {{- include "kagent.labels" . | nindent 4 }}
+    {{- include "kagent-tools.labels" . | nindent 4 }}
 rules:
 - apiGroups: ["*"]
   resources: ["*"]

helm/kagent-tools/templates/clusterrolebinding.yaml

@@ -3,22 +3,22 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   {{- if .Values.rbac.readOnly }}
-  name: {{ include "kagent.fullname" . }}-read-rolebinding
+  name: {{ include "kagent-tools.fullname" . }}-read-rolebinding
   {{- else }}
-  name: {{ include "kagent.fullname" . }}-cluster-admin-rolebinding
+  name: {{ include "kagent-tools.fullname" . }}-cluster-admin-rolebinding
   {{- end }}
   labels:
-    {{- include "kagent.labels" . | nindent 4 }}
+    {{- include "kagent-tools.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   {{- if .Values.rbac.readOnly }}
-  name: {{ include "kagent.fullname" . }}-read-role
+  name: {{ include "kagent-tools.fullname" . }}-read-role
   {{- else }}
-  name: {{ include "kagent.fullname" . }}-cluster-admin-role
+  name: {{ include "kagent-tools.fullname" . }}-cluster-admin-role
   {{- end }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "kagent.fullname" . }}
-  namespace: {{ include "kagent.namespace" . }}
+  name: {{ include "kagent-tools.fullname" . }}
+  namespace: {{ include "kagent-tools.namespace" . }}
 {{- end }}

helm/kagent-tools/templates/deployment.yaml

@@ -1,23 +1,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "kagent.fullname" . }}
-  namespace: {{ include "kagent.namespace" . }}
+  name: {{ include "kagent-tools.fullname" . }}
+  namespace: {{ include "kagent-tools.namespace" . }}
   labels:
-    {{- include "kagent.labels" . | nindent 4 }}
+    {{- include "kagent-tools.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "kagent.selectorLabels" . | nindent 6 }}
+      {{- include "kagent-tools.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "kagent.selectorLabels" . | nindent 8 }}
+        {{- include "kagent-tools.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -43,15 +43,15 @@ spec:
           {{- if not (hasKey . "labelSelector") }}
           labelSelector:
             matchLabels:
-              {{- include "kagent.selectorLabels" $ | nindent 14 }}
+              {{- include "kagent-tools.selectorLabels" $ | nindent 14 }}
           {{- end }}
       {{- end }}
       {{- end }}
 
 
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      serviceAccountName: {{ include "kagent.serviceAccountName" . }}
+      serviceAccountName: {{ include "kagent-tools.serviceAccountName" . }}
       containers:
         - name: tools
           command:
@@ -82,7 +82,7 @@ spec:
             - name: OPENAI_API_KEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "kagent.fullname" . }}-openai
+                  name: {{ include "kagent-tools.fullname" . }}-openai
                   key: OPENAI_API_KEY
                   optional: true # if the secret is not found, the tool will not be available
             - name: OTEL_TRACING_ENABLED

helm/kagent-tools/templates/service.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "kagent.fullname" . }}
-  namespace: {{ include "kagent.namespace" . }}
+  name: {{ include "kagent-tools.fullname" . }}
+  namespace: {{ include "kagent-tools.namespace" . }}
   labels:
-    {{- include "kagent.labels" . | nindent 4 }}
+    {{- include "kagent-tools.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -18,20 +18,20 @@ spec:
       protocol: TCP
       name: tools
   selector:
-    {{- include "kagent.selectorLabels" . | nindent 4 }}
+    {{- include "kagent-tools.selectorLabels" . | nindent 4 }}
 
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "kagent.fullname" . }}-metrics
-  namespace: {{ include "kagent.namespace" . }}
+  name: {{ include "kagent-tools.fullname" . }}-metrics
+  namespace: {{ include "kagent-tools.namespace" . }}
   labels:
-    {{- include "kagent.labels" . | nindent 4 }}
+    {{- include "kagent-tools.labels" . | nindent 4 }}
     app.kubernetes.io/component: metrics
 spec:
   selector:
-    {{- include "kagent.selectorLabels" . | nindent 4 }}
+    {{- include "kagent-tools.selectorLabels" . | nindent 4 }}
   ports:
     - name: prometheus-metrics
       protocol: TCP

helm/kagent-tools/templates/serviceaccount.yaml

@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "kagent.fullname" . }}
-  namespace: {{ include "kagent.namespace" . }}
+  name: {{ include "kagent-tools.fullname" . }}
+  namespace: {{ include "kagent-tools.namespace" . }}
   labels:
-    {{- include "kagent.labels" . | nindent 4 }}
+    {{- include "kagent-tools.labels" . | nindent 4 }}
 {{- end }}

helm/kagent-tools/templates/servicemonitor.yaml

@@ -3,18 +3,18 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "kagent.fullname" . }}
-  namespace: {{ include "kagent.namespace" . }}
+  name: {{ include "kagent-tools.fullname" . }}
+  namespace: {{ include "kagent-tools.namespace" . }}
   labels:
     {{- toYaml .Values.tools.metrics.servicemonitor.labels | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      {{- include "kagent.selectorLabels" . | nindent 6 }}
+      {{- include "kagent-tools.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: metrics
   namespaceSelector:
     matchNames:
-      - {{ include "kagent.namespace" . }}
+      - {{ include "kagent-tools.namespace" . }}
   endpoints:
     - port: prometheus-metrics
       interval: {{ .Values.tools.metrics.servicemonitor.interval | default "30s" }}