Fix host when ingress disabled

opf · Oct 23, 2024 · 83b6857 · 83b6857
1 parent 57ea985
commit 83b6857
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/.changeset/curvy-tips-shake.md b/.changeset/curvy-tips-shake.md
@@ -0,0 +1,5 @@
+---
+"@openproject/helm-charts": patch
+---
+
+Fix indent when outputting host without ingress
diff --git a/charts/openproject/templates/secret_core.yaml b/charts/openproject/templates/secret_core.yaml
@@ -23,7 +23,7 @@ stringData:
   OPENPROJECT_SEED_LOCALE: {{ .Values.openproject.seed_locale | quote }}
   {{- if .Values.ingress.enabled }}
   OPENPROJECT_HOST__NAME: {{ .Values.openproject.host | default .Values.ingress.host | quote }}
-  {{- else if .Values.openproject.host -}}
+  {{- else if .Values.openproject.host }}
   OPENPROJECT_HOST__NAME: {{ .Values.openproject.host | quote }}
   {{- end }}
   OPENPROJECT_HSTS: {{ .Values.openproject.hsts | quote }}

diff --git a/spec/charts/openproject/host_name_spec.rb b/spec/charts/openproject/host_name_spec.rb
@@ -46,4 +46,22 @@
         .not_to include("OPENPROJECT_HOST__NAME")
     end
   end
+
+  context 'when setting host name and disabling ingress' do
+    let(:default_values) do
+      HelmTemplate.with_defaults(<<~YAML
+        ingress:
+          enabled: false
+        openproject:
+          host: foo.example.com
+      YAML
+      )
+    end
+
+    it 'the host is not output', :aggregate_failures do
+      expect(subject)
+        .to include("OPENPROJECT_HOST__NAME" => "foo.example.com")
+
+    end
+  end
 end