Skip to content

fix: add istio resource defaults #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrickleet merged 1 commit into from
May 25, 2026
Merged

fix: add istio resource defaults #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions functions/render/210-istiod.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
14 changes: 10 additions & 4 deletions functions/render/215-istio-cni.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
12 changes: 10 additions & 2 deletions functions/render/220-ztunnel.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion tests/test-render/main.k
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
}
}
}
{
Expand All @@ -58,6 +61,7 @@ _items = [
chart.name = "ztunnel"
chart.version = "1.29.2"
namespace = "istio-system"
values.resources.requests = {cpu = "35m", memory = "100Mi"}
}
}
]
Expand Down
Loading