From 26685633ce57a02a4b675a03f7c934690b5dcf11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Guy=20S=C3=BC=C3=9F?= Date: Wed, 16 Jul 2025 16:54:20 +1000 Subject: [PATCH] simplify the ingress for test purposes --- .../templates/ingress.yaml | 36 +++++++++++++++++++ .../templates/service.yaml | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 charts/fhirflare-ig-toolkit/templates/ingress.yaml diff --git a/charts/fhirflare-ig-toolkit/templates/ingress.yaml b/charts/fhirflare-ig-toolkit/templates/ingress.yaml new file mode 100644 index 0000000..b8cd7ef --- /dev/null +++ b/charts/fhirflare-ig-toolkit/templates/ingress.yaml @@ -0,0 +1,36 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "fhirflare-ig-toolkit.fullname" . -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +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 "fhirflare-ig-toolkit.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + rules: + - http: + paths: + - path: / + {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ .Values.service.port | default 5000 }} + {{ else }} + backend: + serviceName: {{ $fullName }} + servicePort: {{ .Values.service.port | default 5000 }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/fhirflare-ig-toolkit/templates/service.yaml b/charts/fhirflare-ig-toolkit/templates/service.yaml index c89ccb0..467d861 100644 --- a/charts/fhirflare-ig-toolkit/templates/service.yaml +++ b/charts/fhirflare-ig-toolkit/templates/service.yaml @@ -9,7 +9,7 @@ spec: ports: - name: http port: {{ .Values.service.port | default 5000 }} - targetPort: http + targetPort: {{ .Values.service.port | default 5000 }} protocol: TCP {{- if and (eq .Values.service.type "NodePort") .Values.service.nodePort }} nodePort: {{ .Values.service.nodePort }}