From 6c58ed73ff582554906b4da832f28b41dff1a174 Mon Sep 17 00:00:00 2001 From: Karl Li Date: Sat, 30 Nov 2024 10:25:55 +0800 Subject: [PATCH] Revert "docker-plain: add simpleHost to chart/values.yaml" This reverts commit 167397b82bfd83749db3f0e57a9ddda46bd8cf38. --- docker-plain/files/chart/templates/NOTES.txt | 4 +--- docker-plain/files/chart/templates/ingress.yaml | 12 ------------ docker-plain/files/chart/values.schema.json | 4 ---- docker-plain/files/chart/values.yaml | 4 ---- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/docker-plain/files/chart/templates/NOTES.txt b/docker-plain/files/chart/templates/NOTES.txt index 721ede54c..1708ecef9 100644 --- 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 index 14489e0f2..a2c5cb5c4 100644 --- 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 index f0cc887bc..051b56aa1 100644 --- 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 index b5c39caac..01f88a17e 100644 --- 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..yaml rather than in this file. - simpleHost: "" hosts: [] # When defining a host you must define also a path # - host: yourapp.yourdomain.com # paths: