From b30b412edbee7c1d74bc702dbaaf757fcc9ef3c5 Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@gmail.com>
Date: Wed, 17 May 2023 21:42:17 +0200
Subject: [PATCH] Tornjak reuse spire-lib.cluster-domain macro (#292)

Resolves #291

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 .../spire/charts/tornjak-frontend/templates/_helpers.tpl  | 8 --------
 .../templates/tests/test-tornjak-connection.yaml          | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/charts/spire/charts/tornjak-frontend/templates/_helpers.tpl b/charts/spire/charts/tornjak-frontend/templates/_helpers.tpl
index 1ad4567..0dadaeb 100644
--- a/charts/spire/charts/tornjak-frontend/templates/_helpers.tpl
+++ b/charts/spire/charts/tornjak-frontend/templates/_helpers.tpl
@@ -41,14 +41,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{- define "tornjak-frontend.cluster-domain" -}}
-{{- if ne (len (dig "k8s" "clusterDomain" "" .Values.global)) 0 }}
-{{- .Values.global.k8s.clusterDomain }}
-{{- else }}
-{{- .Values.clusterDomain }}
-{{- end }}
-{{- end }}
-
 {{/*
 Common labels
 */}}
diff --git a/charts/spire/charts/tornjak-frontend/templates/tests/test-tornjak-connection.yaml b/charts/spire/charts/tornjak-frontend/templates/tests/test-tornjak-connection.yaml
index af4aea4..4afec45 100644
--- a/charts/spire/charts/tornjak-frontend/templates/tests/test-tornjak-connection.yaml
+++ b/charts/spire/charts/tornjak-frontend/templates/tests/test-tornjak-connection.yaml
@@ -14,7 +14,7 @@ spec:
     - name: curl-tornjak-frontend
       image: cgr.dev/chainguard/bash:latest
       command: ['curl']
-      args: ['-k', '-s', '-f', 'http://{{ include "tornjak-frontend.fullname" . }}.{{ include "tornjak-frontend.namespace" . }}.svc.{{ include "tornjak-frontend.cluster-domain" . }}:{{ .Values.service.port }}']
+      args: ['-k', '-s', '-f', 'http://{{ include "tornjak-frontend.fullname" . }}.{{ include "tornjak-frontend.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.service.port }}']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
   restartPolicy: Never