From 110f1a88cd9dd9cd69d658043f5936e09fc5239e Mon Sep 17 00:00:00 2001
From: titver968 <vermesan@hotmail.com>
Date: Fri, 7 Mar 2025 09:04:20 +0100
Subject: [PATCH] ingress.yaml onto right pfad

---
 index.yaml                    |   6 +--
 ingress.yaml                  |   4 +-
 tatort-0.1.1.tgz              | Bin 2597 -> 2474 bytes
 tatort/templates/ingress.yaml |  75 ++++++++++++++++------------------
 4 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/index.yaml b/index.yaml
index 89905ef..a7292a3 100644
--- a/index.yaml
+++ b/index.yaml
@@ -3,12 +3,12 @@ entries:
   tatort:
   - apiVersion: v2
     appVersion: 0.0.1
-    created: "2025-03-07T08:56:10.227617+01:00"
+    created: "2025-03-07T09:02:19.086473+01:00"
     description: A Helm chart for Kubernetes
-    digest: eb4ba242257cb5c08abfd69865fcd6d8b04822ca039464281d8ab2ce8c0ccc56
+    digest: 3bd2bda018e0c47d5752c34e4cc215ac2e46582005376f4fa101da1c7e1bb1bf
     name: tatort
     type: application
     urls:
     - https://gitea.innohub.local:3000/innohub/charts/raw/main/tatort-0.1.1.tgz
     version: 0.1.1
-generated: "2025-03-07T08:56:10.227278+01:00"
+generated: "2025-03-07T09:02:19.086143+01:00"
diff --git a/ingress.yaml b/ingress.yaml
index 795c1af..a3088e3 100644
--- a/ingress.yaml
+++ b/ingress.yaml
@@ -13,9 +13,9 @@ metadata:
     component: tatort
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
+{{- with .Values.ingress.annotations }}
   annotations:
-    {{- with .Values.ingress.annotations }}
-#    {{- with $ingress.annotations }}
+    {{- with $ingress.annotations }}
     {{- . | toYaml | niindent 4 }}
     {{- end }}
 spec:
diff --git a/tatort-0.1.1.tgz b/tatort-0.1.1.tgz
index 1c8735b4d75b4bdec99631d6233f4818f348073f..905ece7553044742a85d22aa8deb3dc159c262f6 100644
GIT binary patch
delta 2437
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
Df7H(9

delta 2561
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
XecQJ`L;G(400960TwemK06YKyz)lhH

diff --git a/tatort/templates/ingress.yaml b/tatort/templates/ingress.yaml
index de915c2..87be322 100644
--- a/tatort/templates/ingress.yaml
+++ b/tatort/templates/ingress.yaml
@@ -1,50 +1,45 @@
-{{ $ingress := .Values.ingress }}
-{{ if $ingress.enabled }}
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "tatort.fullname" . -}}
+{{- $servicePort := .Values.service.port -}}
+{{- $ingressPath := .Values.ingress.path -}}
+{{- $ingressPathType := .Values.ingress.pathtype -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "tatort.fullname" . }}
+  name: {{ $fullName }}
   labels:
-    app.kubernetes.io/name: {{ include "tatort.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "tatort.chart" . }}
+    app: {{ template "tatort.name" . }}
+    chart: {{ template "tatort.chart" . }}
+    component: tatort
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
   annotations:
-    {{- if .Values.ingress.tls }}
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    kubernetes.io/tls-acme: "true"
-    {{- else }}
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    {{- end }}
-    {{- with $ingress.annotations }}
+    {{- with .Values.ingress.annotations }}
     {{- . | toYaml | nindent 4 }}
     {{- end }}
 spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  rules:
-  {{ range $host := $ingress.hosts }}
-  - host: {{ $host | quote }}
-    http:
-      paths:
-      - path: {{ $ingress.path }}
-        {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-        backend:
-          service:
-            name: http
-            port:
-              number: 4173
-        pathType: Prefix
-        {{- else }}
-        backend:
-          serviceName: http
-          servicePort: 4173
-        {{- end }}
-  {{ end }}
-  {{ if $ingress.tls }}
+{{- if .Values.ingress.tls }}
   tls:
-    {{- $ingress.tls | toYaml | nindent 4 }}
-  {{ end }}
-{{ end }}
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: 4173
+  {{- end }}
+{{- end }}