From 5e4d359ba9b9f3d2f1764aeb7df0c22c2dbb44df Mon Sep 17 00:00:00 2001 From: Siegfried Kiermayer Date: Thu, 5 Jan 2023 18:15:18 +0100 Subject: [PATCH 1/2] provide simpleHost variable in helm --- charts/app-dashboard/templates/ingress.yaml | 40 ++++++--------------- charts/app-dashboard/values.yaml | 13 ++----- 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/charts/app-dashboard/templates/ingress.yaml b/charts/app-dashboard/templates/ingress.yaml index 944ed32..a658cb8 100644 --- a/charts/app-dashboard/templates/ingress.yaml +++ b/charts/app-dashboard/templates/ingress.yaml @@ -11,38 +11,18 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: + hosts: + - host: {{ .Values.simpleHost }} paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} + - path: / + pathType: ImplementationSpecific backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ $fullName }} + name: { { $fullName } } port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} + number: { { $svcPort } } + tls: + - secretName: tls-secret + hosts: + - {{ .Values.simpleHost }} diff --git a/charts/app-dashboard/values.yaml b/charts/app-dashboard/values.yaml index 7a425dc..39e4242 100644 --- a/charts/app-dashboard/values.yaml +++ b/charts/app-dashboard/values.yaml @@ -1,6 +1,6 @@ ignoreNamespaces: "argocd,kube-system" environmentName: "Unset" - +simpleHost: "" replicaCount: 1 @@ -30,19 +30,10 @@ podAnnotations: {} ingress: enabled: false - className: "" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + resources: {} # We usually recommend not to specify default resources and to leave this as a conscious From 6822dd8e765f811b1c18c87d9f2cabb66750b414 Mon Sep 17 00:00:00 2001 From: Siegfried Kiermayer Date: Thu, 5 Jan 2023 18:15:42 +0100 Subject: [PATCH 2/2] increase version to RC5 --- charts/app-dashboard/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/app-dashboard/Chart.yaml b/charts/app-dashboard/Chart.yaml index d611152..5a5a0d5 100644 --- a/charts/app-dashboard/Chart.yaml +++ b/charts/app-dashboard/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-RC4 +version: 1.0.0-RC5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to