From 90ac6de475677a90aa8dab613376a2a8a735405e Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 6 Feb 2026 12:53:51 +0100 Subject: [PATCH] feat(kubernetes): auto-enable Gateway API support in cert-manager When the Gateway API addon is enabled, automatically configure cert-manager with enableGatewayAPI: true. Uses the same default values + mergeOverwrite pattern as Cilium for consistency. Co-Authored-By: Claude Signed-off-by: Andrei Kvapil --- .../templates/helmreleases/cert-manager.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml b/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml index 991ed70f..6857581a 100644 --- a/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml @@ -1,3 +1,13 @@ +{{- define "cozystack.defaultCertManagerValues" -}} +{{- if $.Values.addons.gatewayAPI.enabled }} +cert-manager: + config: + apiVersion: controller.config.cert-manager.io/v1alpha1 + kind: ControllerConfiguration + enableGatewayAPI: true +{{- end }} +{{- end }} + {{- if .Values.addons.certManager.enabled }} apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease @@ -29,11 +39,8 @@ spec: force: true remediation: retries: -1 - {{- with .Values.addons.certManager.valuesOverride }} values: - {{- toYaml . | nindent 4 }} - {{- end }} - + {{- toYaml (deepCopy .Values.addons.certManager.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCertManagerValues" .))) | nindent 4 }} dependsOn: {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - name: {{ .Release.Name }}