fix(helm): per-agent image as string, fallback to appVersion, persistence.size default 1Gi (#145)

* fix(helm): per-agent image as string, fallback to appVersion, persistence.size default 1Gi

* fix(helm): guard nil persistence in pvc template

* docs: fix claude working_dir to /home/node in manual config example

* fix: readme

* feat(helm): add per-agent enabled flag to skip resource creation

Default kiro agent persists via Helm deep merge even when users only
define a different agent. Add `agents.<name>.enabled` (default true)
so users can set `agents.kiro.enabled: false` to avoid creating
unwanted resources. Update README with all three deployment scenarios.

Author: neilkuan

README.md

@@ -97,11 +97,34 @@ See the **[Helm chart docs](https://openabdev.github.io/openab)** for full insta
 ```bash
 helm repo add openab https://openabdev.github.io/openab
 helm repo update
+
+# Kiro CLI only (default)
 helm install openab openab/openab \
   --set agents.kiro.discord.botToken="$DISCORD_BOT_TOKEN" \
   --set-string 'agents.kiro.discord.allowedChannels[0]=YOUR_CHANNEL_ID'
+
+# Claude Code only (disable default kiro)
+helm install openab openab/openab \
+  --set agents.kiro.enabled=false \
+  --set agents.claude.discord.botToken="$DISCORD_BOT_TOKEN" \
+  --set-string 'agents.claude.discord.allowedChannels[0]=YOUR_CHANNEL_ID' \
+  --set agents.claude.image=ghcr.io/openabdev/openab-claude:78f8d2c \
+  --set agents.claude.command=claude-agent-acp \
+  --set agents.claude.workingDir=/home/node
+
+# Multi-agent (kiro + claude in one release)
+helm install openab openab/openab \
+  --set agents.kiro.discord.botToken="$KIRO_BOT_TOKEN" \
+  --set-string 'agents.kiro.discord.allowedChannels[0]=KIRO_CHANNEL_ID' \
+  --set agents.claude.discord.botToken="$CLAUDE_BOT_TOKEN" \
+  --set-string 'agents.claude.discord.allowedChannels[0]=CLAUDE_CHANNEL_ID' \
+  --set agents.claude.image=ghcr.io/openabdev/openab-claude:78f8d2c \
+  --set agents.claude.command=claude-agent-acp \
+  --set agents.claude.workingDir=/home/node
 ```
 
+Each agent key in `agents` map creates its own Deployment, ConfigMap, Secret, and PVC. Set `agents.<name>.enabled: false` to skip creating resources for an agent.
+
 ### Manual config.toml
 
 For non-Helm deployments, configure the `[agent]` block per CLI:
@@ -117,19 +140,19 @@ working_dir = "/home/agent"
 [agent]
 command = "codex-acp"
 args = []
-working_dir = "/home/agent"
+working_dir = "/home/node"
 
 # Claude Code (requires claude-agent-acp in PATH)
 [agent]
 command = "claude-agent-acp"
 args = []
-working_dir = "/home/agent"
+working_dir = "/home/node"
 
 # Gemini
 [agent]
 command = "gemini"
 args = ["--acp"]
-working_dir = "/home/agent"
+working_dir = "/home/node"
 env = { GEMINI_API_KEY = "${GEMINI_API_KEY}" }
 ```
 

charts/openab/templates/NOTES.txt

@@ -4,6 +4,7 @@ openab {{ .Chart.AppVersion }} has been installed!
 
 Agents deployed:
 {{- range $name, $cfg := .Values.agents }}
+{{- if ne (include "openab.agentEnabled" $cfg) "false" }}
   • {{ $name }} ({{ $cfg.command }})
 {{- if not $cfg.discord.botToken }}
     ⚠️  No bot token provided. Create the secret manually:
@@ -28,3 +29,4 @@ Agents deployed:
     Restart after auth:
     kubectl rollout restart deployment/{{ include "openab.agentFullname" (dict "ctx" $ "agent" $name) }}
 {{- end }}
+{{- end }}

charts/openab/templates/_helpers.tpl

@@ -41,11 +41,27 @@ app.kubernetes.io/component: {{ .agent }}
 {{- printf "%s-%s" (include "openab.fullname" .ctx) .agent | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{/* Resolve image: agent-level override → global default */}}
+{{/* Resolve image: agent-level string override → global default (repository:tag, tag defaults to appVersion) */}}
 {{- define "openab.agentImage" -}}
-{{- $repo := .ctx.Values.image.repository }}
-{{- $tag := .ctx.Values.image.tag }}
-{{- if and .cfg.image .cfg.image.repository (ne .cfg.image.repository "") }}{{ $repo = .cfg.image.repository }}{{ end }}
-{{- if and .cfg.image .cfg.image.tag (ne .cfg.image.tag "") }}{{ $tag = .cfg.image.tag }}{{ end }}
-{{- printf "%s:%s" $repo $tag }}
+{{- if and .cfg.image (kindIs "string" .cfg.image) (ne .cfg.image "") }}
+{{- .cfg.image }}
+{{- else }}
+{{- $tag := default .ctx.Chart.AppVersion .ctx.Values.image.tag }}
+{{- printf "%s:%s" .ctx.Values.image.repository $tag }}
+{{- end }}
+{{- end }}
+
+{{/* Resolve imagePullPolicy: global default (per-agent image string has no pullPolicy) */}}
+{{- define "openab.agentImagePullPolicy" -}}
+{{- .ctx.Values.image.pullPolicy }}
+{{- end }}
+
+{{/* Agent enabled: default true unless explicitly set to false */}}
+{{- define "openab.agentEnabled" -}}
+{{- if eq (.enabled | toString) "false" }}false{{ else }}true{{ end }}
+{{- end }}
+
+{{/* Persistence enabled: default true unless explicitly set to false */}}
+{{- define "openab.persistenceEnabled" -}}
+{{- if and . .persistence (eq (.persistence.enabled | toString) "false") }}false{{ else }}true{{ end }}
 {{- end }}

charts/openab/templates/configmap.yaml

@@ -1,4 +1,5 @@
 {{- range $name, $cfg := .Values.agents }}
+{{- if ne (include "openab.agentEnabled" $cfg) "false" }}
 {{- $d := dict "ctx" $ "agent" $name "cfg" $cfg }}
 ---
 apiVersion: v1
@@ -38,3 +39,4 @@ data:
     {{- $cfg.agentsMd | nindent 4 }}
   {{- end }}
 {{- end }}
+{{- end }}

charts/openab/templates/deployment.yaml

@@ -1,6 +1,7 @@
 {{- range $name, $cfg := .Values.agents }}
+{{- if ne (include "openab.agentEnabled" $cfg) "false" }}
 {{- $d := dict "ctx" $ "agent" $name "cfg" $cfg }}
-{{- $pvcEnabled := and $cfg.persistence $cfg.persistence.enabled }}
+{{- $pvcEnabled := not (eq (include "openab.persistenceEnabled" $cfg) "false") }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -31,7 +32,7 @@ spec:
       containers:
         - name: openab
           image: {{ include "openab.agentImage" $d | quote }}
-          imagePullPolicy: {{ $.Values.image.pullPolicy }}
+          imagePullPolicy: {{ include "openab.agentImagePullPolicy" $d }}
           {{- with $.Values.containerSecurityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
@@ -93,3 +94,4 @@ spec:
             claimName: {{ include "openab.agentFullname" $d }}
         {{- end }}
 {{- end }}
+{{- end }}

charts/openab/templates/pvc.yaml

@@ -1,5 +1,6 @@
 {{- range $name, $cfg := .Values.agents }}
-{{- if and $cfg.persistence $cfg.persistence.enabled }}
+{{- if ne (include "openab.agentEnabled" $cfg) "false" }}
+{{- if not (eq (include "openab.persistenceEnabled" $cfg) "false") }}
 {{- $d := dict "ctx" $ "agent" $name "cfg" $cfg }}
 ---
 apiVersion: v1
@@ -11,11 +12,12 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  {{- if $cfg.persistence.storageClass }}
+  {{- if and $cfg.persistence $cfg.persistence.storageClass }}
   storageClassName: {{ $cfg.persistence.storageClass }}
   {{- end }}
   resources:
     requests:
-      storage: {{ $cfg.persistence.size }}
+      storage: {{ (and $cfg.persistence $cfg.persistence.size) | default "1Gi" }}
+{{- end }}
 {{- end }}
 {{- end }}

charts/openab/templates/secret.yaml

@@ -1,4 +1,5 @@
 {{- range $name, $cfg := .Values.agents }}
+{{- if ne (include "openab.agentEnabled" $cfg) "false" }}
 {{- if $cfg.discord.botToken }}
 {{- $d := dict "ctx" $ "agent" $name "cfg" $cfg }}
 ---
@@ -15,3 +16,4 @@ data:
   discord-bot-token: {{ $cfg.discord.botToken | b64enc | quote }}
 {{- end }}
 {{- end }}
+{{- end }}

charts/openab/values.yaml

@@ -1,6 +1,7 @@
 image:
   repository: ghcr.io/openabdev/openab
-  tag: "78f8d2c"
+  # tag defaults to .Chart.AppVersion
+  tag: ""
   pullPolicy: IfNotPresent
 
 podSecurityContext:
@@ -17,6 +18,7 @@ containerSecurityContext:
 
 agents:
   kiro:
+    enabled: true    # set to false to skip creating resources for this agent
     # To add a second agent, uncomment and fill in the block below:
     # claude:
     #   command: claude-agent-acp
@@ -44,9 +46,8 @@ agents:
     #   nodeSelector: {}
     #   tolerations: []
     #   affinity: {}
-    image:
-      repository: ""
-      tag: ""
+    #   image: "ghcr.io/openabdev/openab-claude:latest"
+    image: ""
     command: kiro-cli
     args:
       - acp
@@ -68,7 +69,7 @@ agents:
     persistence:
       enabled: true
       storageClass: ""
-      size: 1Gi
+      size: 1Gi  # defaults to 1Gi if not set
     agentsMd: ""
     resources: {}
     nodeSelector: {}