Revert "docker-plain: add simpleHost to chart/values.yaml"

This reverts commit 167397b.
opendevstack · Nov 30, 2024 · 6c58ed7 · 6c58ed7
1 parent fe5fa7f
commit 6c58ed7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/docker-plain/files/chart/templates/NOTES.txt b/docker-plain/files/chart/templates/NOTES.txt
@@ -1,9 +1,7 @@
 Component '{{ include "chart.fullname" . }}' on version '{{ .Values.imageTag }}' released with Helm!
 {{- if .Values.ingress.enabled }}
 The component is exposed via the following routes:
-{{- if .Values.ingress.simpleHost }}
-{{ printf "https://%s" .Values.ingress.simpleHost }}
-{{- end }}
+{{- $appUrl := .Values.appUrl -}}
 {{- range .Values.ingress.hosts }}
 {{ printf "https://%s" .host }}
 {{- end }}

diff --git a/docker-plain/files/chart/templates/ingress.yaml b/docker-plain/files/chart/templates/ingress.yaml
@@ -32,18 +32,6 @@ spec:
   - {}
   {{- end }}
   rules:
-    {{- if .Values.ingress.simpleHost }}
-    - host: {{ .Values.ingress.simpleHost | quote }}
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-    {{- end }}
     {{- range .Values.ingress.hosts }}
     - host: {{ .host | quote }}
       http:

diff --git a/docker-plain/files/chart/values.schema.json b/docker-plain/files/chart/values.schema.json
@@ -81,10 +81,6 @@
             "type": "string"
           }
         },
-        "simpleHost": {
-          "description": "Hostname for simple use cases",
-          "type": "string"
-        },
         "hosts": {
           "description": "List of ingress hosts",
           "type": "array",

diff --git a/docker-plain/files/chart/values.yaml b/docker-plain/files/chart/values.yaml
@@ -33,10 +33,6 @@ ingress:
     ## e.g. add cert-manager support by annotating the ingress https://cert-manager.io/docs/usage/ingress/
     ## ask in your company for good defaults
 
-  # If no more than one URL is needed, simpleHost is probably sufficient. Alternatively, Use hosts for more customization capabilities.
-  # simpleHost and hosts can coexist. Check out templates/ingress.yaml for more details.
-  # Usually we want different URLs for dev, test and prod environments. It makes sense to define them in values.<env>.yaml rather than in this file.
-  simpleHost: ""
   hosts: [] # When defining a host you must define also a path
   # - host: yourapp.yourdomain.com
   #   paths: