From ed0ce3d192e6b5d5c9b51008991f09fda74fa774 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stv0g@noreply.gitea.io>
Date: Fri, 30 Oct 2020 01:08:58 +0800
Subject: [PATCH] Make cluster domain configurable (#51)

Merge branch 'master' into cluster-domain

Make cluster domain configurable

Currently the deployment fails due to a hard-coded cluster domain "cluster.local".

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Steffen Vogel <post@steffenvogel.de>
Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/51
Reviewed-by: luhahn <luhahn@noreply.gitea.io>
Reviewed-by: Andrew Thornton <art27@cantab.net>
Co-Authored-By: Steffen Vogel <stv0g@noreply.gitea.io>
Co-Committed-By: Steffen Vogel <stv0g@noreply.gitea.io>
---
 templates/_helpers.tpl | 10 +++++-----
 values.yaml            |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 01194dc..1da21a6 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -76,22 +76,22 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{- define "postgresql.dns" -}}
-{{- printf "%s-postgresql.%s.svc.cluster.local:%g" .Release.Name .Release.Namespace .Values.postgresql.global.postgresql.servicePort -}}
+{{- printf "%s-postgresql.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.postgresql.global.postgresql.servicePort -}}
 {{- end -}}
 
 {{- define "mysql.dns" -}}
-{{- printf "%s-mysql.%s.svc.cluster.local:%g" .Release.Name .Release.Namespace .Values.mysql.service.port | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-mysql.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.mysql.service.port | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "mariadb.dns" -}}
-{{- printf "%s-mariadb.%s.svc.cluster.local:%g" .Release.Name .Release.Namespace .Values.mariadb.primary.service.port | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-mariadb.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.mariadb.primary.service.port | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "memcached.dns" -}}
-{{- printf "%s-memcached.%s.svc.cluster.local:%g" .Release.Name .Release.Namespace .Values.memcached.service.port | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-memcached.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.memcached.service.port | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "gitea.default_domain" -}}
-{{- printf "%s-gitea.%s.svc.cluster.local" (include "gitea.fullname" .) .Release.Namespace  | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-gitea.%s.svc.%s" (include "gitea.fullname" .) .Release.Namespace .Values.clusterDomain | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
diff --git a/values.yaml b/values.yaml
index 237f449..c09f0dd 100644
--- a/values.yaml
+++ b/values.yaml
@@ -4,6 +4,8 @@
 
 replicaCount: 1
 
+clusterDomain: cluster.local
+
 image:
   repository: gitea/gitea
   version: 1.12.5
@@ -149,4 +151,4 @@ mariadb:
     service:
       port: 3306
     persistence:
-      size: 10Gi
\ No newline at end of file
+      size: 10Gi