From 503fd0cf45889154b2f78d8a1872a453d1b20d5d Mon Sep 17 00:00:00 2001
From: Patrick Lee Scott <pat@patscott.io>
Date: Sun, 24 May 2026 23:49:17 -0500
Subject: [PATCH] fix: add istio resource defaults

---
 functions/render/210-istiod.yaml.gotmpl    | 31 +++++++++++++---------
 functions/render/215-istio-cni.yaml.gotmpl | 14 +++++++---
 functions/render/220-ztunnel.yaml.gotmpl   | 12 +++++++--
 tests/test-render/main.k                   |  6 ++++-
 4 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/functions/render/210-istiod.yaml.gotmpl b/functions/render/210-istiod.yaml.gotmpl
index bfdf031..c04015c 100644
--- a/functions/render/210-istiod.yaml.gotmpl
+++ b/functions/render/210-istiod.yaml.gotmpl
@@ -6,6 +6,23 @@
 # attempting to override via overrideAllValues is unsupported.
 #
 
+{{- $meshConfig := dict "accessLogFile" "/dev/stdout" }}
+{{- if gt (len $state.extensionProviders) 0 }}
+  {{- $_ := set $meshConfig "extensionProviders" $state.extensionProviders }}
+{{- end }}
+{{- $chartDefaults := dict
+  "profile" "ambient"
+  "meshConfig" $meshConfig
+  "pilot" (dict
+    "env" (dict "PILOT_ENABLE_METADATA_EXCHANGE" "true")
+    "resources" (dict
+      "requests" (dict "cpu" "23m" "memory" "121Mi")
+      "limits" (dict "cpu" "1000m" "memory" "512Mi")
+    )
+  )
+}}
+{{- $mergedValues := mergeOverwrite $chartDefaults ($state.istiod.values | default dict) }}
+
 ---
 apiVersion: helm.m.crossplane.io/v1beta1
 kind: Release
@@ -23,19 +40,7 @@ spec:
       version: {{ $state.chartVersion | quote }}
     namespace: {{ $state.namespace }}
     values:
-      profile: ambient
-      meshConfig:
-        accessLogFile: /dev/stdout
-        {{- if gt (len $state.extensionProviders) 0 }}
-        extensionProviders:
-          {{- toYaml $state.extensionProviders | nindent 10 }}
-        {{- end }}
-      pilot:
-        env:
-          PILOT_ENABLE_METADATA_EXCHANGE: "true"
-      {{- if gt (len $state.istiod.values) 0 }}
-      {{- toYaml $state.istiod.values | nindent 6 }}
-      {{- end }}
+      {{- toYaml $mergedValues | nindent 6 }}
   rollbackLimit: 3
   providerConfigRef:
     name: {{ $state.helmProviderConfigRef.name }}
diff --git a/functions/render/215-istio-cni.yaml.gotmpl b/functions/render/215-istio-cni.yaml.gotmpl
index 0c2395b..8785aa8 100644
--- a/functions/render/215-istio-cni.yaml.gotmpl
+++ b/functions/render/215-istio-cni.yaml.gotmpl
@@ -9,6 +9,15 @@
 # Chart: istio/cni
 #
 
+{{- $chartDefaults := dict
+  "profile" "ambient"
+  "resources" (dict
+    "requests" (dict "cpu" "15m" "memory" "100Mi")
+    "limits" (dict "cpu" "100m" "memory" "256Mi")
+  )
+}}
+{{- $mergedValues := mergeOverwrite $chartDefaults ($state.cni.values | default dict) }}
+
 ---
 apiVersion: helm.m.crossplane.io/v1beta1
 kind: Release
@@ -30,10 +39,7 @@ spec:
       {{- toYaml $state.cni.overrideAllValues | nindent 6 }}
     {{- else }}
     values:
-      profile: ambient
-      {{- if gt (len $state.cni.values) 0 }}
-      {{- toYaml $state.cni.values | nindent 6 }}
-      {{- end }}
+      {{- toYaml $mergedValues | nindent 6 }}
     {{- end }}
   rollbackLimit: 3
   providerConfigRef:
diff --git a/functions/render/220-ztunnel.yaml.gotmpl b/functions/render/220-ztunnel.yaml.gotmpl
index 26929ca..e0be996 100644
--- a/functions/render/220-ztunnel.yaml.gotmpl
+++ b/functions/render/220-ztunnel.yaml.gotmpl
@@ -6,6 +6,14 @@
 # Chart: istio/ztunnel
 #
 
+{{- $chartDefaults := dict
+  "resources" (dict
+    "requests" (dict "cpu" "35m" "memory" "100Mi")
+    "limits" (dict "cpu" "250m" "memory" "256Mi")
+  )
+}}
+{{- $mergedValues := mergeOverwrite $chartDefaults ($state.ztunnel.values | default dict) }}
+
 ---
 apiVersion: helm.m.crossplane.io/v1beta1
 kind: Release
@@ -25,9 +33,9 @@ spec:
     {{- if gt (len $state.ztunnel.overrideAllValues) 0 }}
     values:
       {{- toYaml $state.ztunnel.overrideAllValues | nindent 6 }}
-    {{- else if gt (len $state.ztunnel.values) 0 }}
+    {{- else }}
     values:
-      {{- toYaml $state.ztunnel.values | nindent 6 }}
+      {{- toYaml $mergedValues | nindent 6 }}
     {{- end }}
   rollbackLimit: 3
   providerConfigRef:
diff --git a/tests/test-render/main.k b/tests/test-render/main.k
index 26b0cce..b34cd91 100644
--- a/tests/test-render/main.k
+++ b/tests/test-render/main.k
@@ -47,7 +47,10 @@ _items = [
                         chart.name = "istiod"
                         chart.version = "1.29.2"
                         namespace = "istio-system"
-                        values.profile = "ambient"
+                        values = {
+                            profile = "ambient"
+                            pilot.resources.requests = {cpu = "23m", memory = "121Mi"}
+                        }
                     }
                 }
                 {
@@ -58,6 +61,7 @@ _items = [
                         chart.name = "ztunnel"
                         chart.version = "1.29.2"
                         namespace = "istio-system"
+                        values.resources.requests = {cpu = "35m", memory = "100Mi"}
                     }
                 }
             ]