From df0483ce13242fae5dccf197c84c3c96be8b0c20 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Mon, 15 Jul 2024 07:21:43 +0200 Subject: [PATCH] Add an ability to install ingress --- charts/workload/Chart.yaml | 2 +- .../workload/templates/ingress/_ingresses.tpl | 28 +++++++++++++++++++ charts/workload/templates/metadata/_base.tpl | 4 +++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 charts/workload/templates/ingress/_ingresses.tpl diff --git a/charts/workload/Chart.yaml b/charts/workload/Chart.yaml index 52e433f..a44fa5d 100644 --- a/charts/workload/Chart.yaml +++ b/charts/workload/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: softplayer-lib-workload description: A library to be reused accross softplayer charts type: library -version: 0.1.8 +version: 0.2.0 maintainers: - name: allanger email: allanger@badhouseplants.net diff --git a/charts/workload/templates/ingress/_ingresses.tpl b/charts/workload/templates/ingress/_ingresses.tpl new file mode 100644 index 0000000..d3ec818 --- /dev/null +++ b/charts/workload/templates/ingress/_ingresses.tpl @@ -0,0 +1,28 @@ +{{- define "lib.ingress" }} +{{- range $k, $v := .Values.ingress }} +{{- $customName := printf "%s-%s" (include "chart.fullname" $) $k }} +{{- if $v.annotations -}} +{{- $annotations := $v.annotations }} +{{- else }} +{{- $annotations := "" }} +{{- end }} +--- +# --------------------------------------------------------------------- +# This ingress is created as a part of softplayer helm library +# please see /lib/tempaltes/ingress/_ingress.tpl +# --------------------------------------------------------------------- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: +{{- include "lib.metadata" (dict "Context" $ "customName" $customName "annotations" $v.annotations)}} +spec: + ingressClassName: $v.class + rules: + {{- with $v.rules }} + {{- tpl ( . | toYaml | nindent 4 | toString) $ }} + {{- end }} + {{- with $v.tls }} + {{- tpl ( . | toYaml | nindent 4 | toString) $ }} + {{- end }} +{{- end }} +{{- end }} diff --git a/charts/workload/templates/metadata/_base.tpl b/charts/workload/templates/metadata/_base.tpl index f42efdb..35e7de2 100644 --- a/charts/workload/templates/metadata/_base.tpl +++ b/charts/workload/templates/metadata/_base.tpl @@ -7,6 +7,10 @@ metadata: {{- end }} labels: {{ include "metadata.labels" .Context | indent 4 }} + {{- if .annotations }} + annotations: +{{ .annotations | toYaml | indent 4 }} + {{- end }} {{- end }} {{- define "metadata.customName" -}}