From 10ec71527f2666e02067c25f2dc0de9a4acf2078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Burzy=C5=84ski?= <czeslavo@gmail.com>
Date: Thu, 9 Nov 2023 15:31:06 +0100
Subject: [PATCH] feat: make expressions router default in kong/ingress

---
 charts/ingress/templates/validation.tpl | 7 +++++++
 charts/ingress/values.yaml              | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 charts/ingress/templates/validation.tpl

diff --git a/charts/ingress/templates/validation.tpl b/charts/ingress/templates/validation.tpl
new file mode 100644
index 000000000..c4d3e34b7
--- /dev/null
+++ b/charts/ingress/templates/validation.tpl
@@ -0,0 +1,7 @@
+{{- /* Validate 'expressions' router flavor is not used with KIC < 3.0 */}}
+{{- if and .Values.controller.ingressController.enabled
+           (eq .Values.gateway.env.router_flavor "expressions")
+           (semverCompare "< 3.0" (include "kong.effectiveVersion" .Values.controller.ingressController.image))
+-}}
+    {{- fail (printf "expressions router flavor is not supported with ingress controller %s" .Values.controller.ingressController.image.tag ) -}}
+{{- end -}}
diff --git a/charts/ingress/values.yaml b/charts/ingress/values.yaml
index 6ad04eb8b..27ddfd0e1 100644
--- a/charts/ingress/values.yaml
+++ b/charts/ingress/values.yaml
@@ -44,3 +44,4 @@ gateway:
   env:
     role: traditional
     database: "off"
+    router_flavor: "expressions"