Fix domain macro

This supersedes #359 and fixes the fallback domain value when no ingress host is defined. Memcached is not used anymore. Postgresql macro has already been fixed otherwise. Signed-off-by: justusbunsi <sk.bunsenbrenner@gmail.com>
2023-11-11 17:24:36 +01:00
parent 7de8e83433
commit 9987aeb4c8
2 changed files with 68 additions and 1 deletions
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -148,7 +148,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}} 
 
 {{- define "gitea.default_domain" -}} 
-{{- printf "%s-gitea.%s.svc.%s" (include "gitea.fullname" .) .Release.Namespace .Values.clusterDomain | trunc 63 | trimSuffix "-" -}} 
+{{- printf "%s-http.%s.svc.%s" (include "gitea.fullname" .) .Release.Namespace .Values.clusterDomain -}} 
 {{- end -}} 
 
 {{- define "gitea.ldap_settings" -}} 
--- a/unittests/config/server-section_domain.yaml
+++ b/unittests/config/server-section_domain.yaml
@@ -0,0 +1,67 @@
+suite: config template | server section (domain related) 
+release: 
+ name: gitea-unittests 
+ namespace: testing 
+tests: 
+ - it: "[default values] uses ingress host for DOMAIN|SSH_DOMAIN|ROOT_URL" 
+ template: templates/gitea/config.yaml 
+ asserts: 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nDOMAIN=git.example.com 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nSSH_DOMAIN=git.example.com 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nROOT_URL=http://git.example.com 
+ 
+################################################ 
+ 
+ - it: "[no ingress hosts] uses gitea http service for DOMAIN|SSH_DOMAIN|ROOT_URL" 
+ template: templates/gitea/config.yaml 
+ set: 
+ ingress: 
+ hosts: [] 
+ asserts: 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nDOMAIN=gitea-unittests-http.testing.svc.cluster.local 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nSSH_DOMAIN=gitea-unittests-http.testing.svc.cluster.local 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nROOT_URL=http://gitea-unittests-http.testing.svc.cluster.local 
+ 
+################################################ 
+ 
+ - it: "[provided via values] uses that for DOMAIN|SSH_DOMAIN|ROOT_URL" 
+ template: templates/gitea/config.yaml 
+ set: 
+ gitea.config.server.DOMAIN: provided.example.com 
+ ingress: 
+ hosts: 
+ - host: non-used.example.com 
+ paths: 
+ - path: / 
+ pathType: Prefix 
+ asserts: 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nDOMAIN=provided.example.com 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nSSH_DOMAIN=provided.example.com 
+ - documentIndex: 0 
+ matchRegex: 
+ path: stringData.server 
+ pattern: \nROOT_URL=http://provided.example.com