Extra objects templating (#284)

* Template priorityexpander values * Add extraObjects values * Upgrade helm chart to 3.0.0
quortex · Apr 22, 2024 · 29dec5b · 29dec5b
1 parent 6d60560
commit 29dec5b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 3 deletions.
diff --git a/helm/kubestitute/Chart.yaml b/helm/kubestitute/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: kubestitute
 type: application
-version: 2.3.0
+version: 3.0.0
 appVersion: "2.2.0"
 description: Kubestitute is an event based instances lifecycle manager for Kubernetes.
 home: https://github.com/quortex/kubestitute

diff --git a/helm/kubestitute/README.md b/helm/kubestitute/README.md
@@ -1,6 +1,6 @@
 # kubestitute
 
-![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
 
 Kubestitute is an event based instances lifecycle manager for Kubernetes.
 
@@ -117,6 +117,7 @@ helm install kubestitute kubestitute/kubestitute -n kubestitute-system
 | serviceMonitor.interval | string | `""` | Override prometheus operator scrapping interval. |
 | serviceMonitor.scrapeTimeout | string | `""` | Override prometheus operator scrapping timeout. |
 | serviceMonitor.relabelings | list | `[]` | Relabellings to apply to samples before scraping. |
+| extraObjects | list | `[]` | Extra objects to deploy (value evaluated as a template). |
 
 ## Maintainers
 

diff --git a/helm/kubestitute/templates/_helpers.tpl b/helm/kubestitute/templates/_helpers.tpl
@@ -51,3 +51,14 @@ app.kubernetes.io/name: {{ include "kubestitute.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 control-plane: controller-manager
 {{- end -}}
+
+{{/*
+Renders a complete tree, even values that contains template.
+*/}}
+{{- define "kubestitute.render" -}}
+  {{- if typeIs "string" .value }}
+    {{- tpl .value .context }}
+  {{ else }}
+    {{- tpl (.value | toYaml) .context }}
+  {{- end }}
+{{- end -}}
diff --git a/helm/kubestitute/templates/extraObjects.yaml b/helm/kubestitute/templates/extraObjects.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ include "kubestitute.render" (dict "value" . "context" $) }}
+{{- end }}
diff --git a/helm/kubestitute/templates/priorityexpander.yaml b/helm/kubestitute/templates/priorityexpander.yaml
@@ -6,6 +6,6 @@ metadata:
   name: {{ .name }}
   namespace: {{ .namespace }}
 spec:
-  template: {{ toYaml .template | indent 4 }}
+  template: {{ toYaml (tpl .template $) | indent 4 }}
 {{- end }}
 {{- end }}
diff --git a/helm/kubestitute/values.yaml b/helm/kubestitute/values.yaml
@@ -148,3 +148,6 @@ serviceMonitor:
   scrapeTimeout: ""
   # -- Relabellings to apply to samples before scraping.
   relabelings: []
+
+# -- Extra objects to deploy (value evaluated as a template).
+extraObjects: []