From b21ab970580f6cfcb10b842c01ed141dd1335388 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Tue, 15 Apr 2025 07:25:03 +1000 Subject: [PATCH] fix: apply istio namespace through the chart --- charts/ftl/templates/namespace.yaml | 8 ++++++++ deployment/Justfile | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 charts/ftl/templates/namespace.yaml diff --git a/charts/ftl/templates/namespace.yaml b/charts/ftl/templates/namespace.yaml new file mode 100644 index 0000000000..d268a74a37 --- /dev/null +++ b/charts/ftl/templates/namespace.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Namespace +metadata: + labels: + {{ if eq .Values.istio.enabled true -}} + istio-injection: enabled + {{- end -}} + name: {{ .Release.Namespace }} diff --git a/deployment/Justfile b/deployment/Justfile index 17ce670603..4a4ca568a9 100644 --- a/deployment/Justfile +++ b/deployment/Justfile @@ -82,7 +82,6 @@ setup-istio-cluster: setup-cluster helm install istio-base istio/base -n istio-system --wait --version 1.23.3 helm install istiod istio/istiod -n istio-system --wait --version 1.23.3 fi - kubectl label namespace default istio-injection=enabled --overwrite kubectl apply -f istio-access-logs.yaml # Complete setup of registry and Istio-enabled cluster @@ -103,7 +102,7 @@ teardown: teardown-cluster teardown-registry apply *args: kubectl delete job --ignore-not-found=true ftl-dbmig-latest helm dependency build ../charts/ftl-k3d - helm upgrade --install ftl-k3d ../charts/ftl-k3d -f values.yaml {{args}} + helm upgrade --install ftl-k3d ../charts/ftl-k3d -f values.yaml -n ftl {{args}} # Deploy specific version of FTL from Helm repository deploy-version version: setup-istio-cluster