diff --git a/index.yaml b/index.yaml index 051e696..34ecb90 100644 --- a/index.yaml +++ b/index.yaml @@ -3,12 +3,12 @@ entries: tatort: - apiVersion: v2 appVersion: 0.0.1 - created: "2025-03-04T14:54:24.417769+01:00" + created: "2025-03-04T15:46:17.922421+01:00" description: A Helm chart for Kubernetes - digest: 8752cecdb8a2ef3a33fb858125a066f24ab57d92937a05f0d38fdada2d0e8767 + digest: 8309451c95cafe98eea6db7f222011fabd82955895e6a8bc26a4afb9676d25de name: tatort type: application urls: - https://gitea.innohub.local:3000/innohub/charts/raw/branch/main/tatort-0.1.0.tgz version: 0.1.0 -generated: "2025-03-04T14:54:24.417374+01:00" +generated: "2025-03-04T15:46:17.921929+01:00" diff --git a/tatort-0.1.0.tgz b/tatort-0.1.0.tgz index 51f146b..6b232a0 100644 Binary files a/tatort-0.1.0.tgz and b/tatort-0.1.0.tgz differ diff --git a/tatort/templates/ingress.yaml b/tatort/templates/ingress.yaml index 006b7db..043b3da 100644 --- a/tatort/templates/ingress.yaml +++ b/tatort/templates/ingress.yaml @@ -1,61 +1,45 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "tatort.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +{{- $servicePort := .Values.service.port -}} +{{- $ingressPath := .Values.ingress.path -}} +{{- $ingressPathType := .Values.ingress.pathtype -}} apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "tatort.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} + app: {{ template "tatort.name" . }} + chart: {{ template "tatort.chart" . }} + component: tatort + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +{{- with .Values.ingress.annotations }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} +{{ toYaml . | indent 4 }} +{{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} +{{- if .Values.ingress.tls }} tls: - {{- range .Values.ingress.tls }} + {{- range .Values.ingress.tls }} - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} + {{- range .hosts }} + - {{ . }} + {{- end }} secretName: {{ .secretName }} - {{- end }} {{- end }} +{{- end }} rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host }} + {{- range .Values.ingress.hosts }} + - host: {{ . }} http: paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} + - path: {{ $ingressPath }} + pathType: {{ $ingressPathType }} backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} + number: 8080 + {{- end }} {{- end }} +