Skip to content

Commit

Permalink
feat: add extraManifest
Browse files Browse the repository at this point in the history
Signed-off-by: Simon LEONARD <[email protected]>
  • Loading branch information
sinux-l5d committed Nov 21, 2024
1 parent 0e64ae5 commit 2ee52c1
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 3 deletions.
2 changes: 1 addition & 1 deletion charts/zabbix/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v2 # Don't change this
name: zabbix
version: 6.0.0 # helm chart version
version: 6.1.0 # helm chart version
# LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy
appVersion: 7.0.5 # zabbix version
description: Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics.
Expand Down
3 changes: 2 additions & 1 deletion charts/zabbix/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Helm chart for Zabbix.

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square) [![Downloads](https://img.shields.io/github/downloads/zabbix-community/helm-zabbix/total?label=Downloads%20All%20Releases
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 6.1.0](https://img.shields.io/badge/Version-6.1.0-informational?style=flat-square) [![Downloads](https://img.shields.io/github/downloads/zabbix-community/helm-zabbix/total?label=Downloads%20All%20Releases
)](https://tooomm.github.io/github-release-stats/?username=zabbix-community&repository=helm-zabbix)

Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics.
Expand Down Expand Up @@ -318,6 +318,7 @@ The following tables lists the configurable parameters of the chart and their de
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | Affinity configurations. Reference: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/ |
| extraManifests | list | `[]` | Extra arbitrary Kubernetes manifests to deploy within the release |
| global.commonLabels | object | `{}` | Labels to apply to all resources. |
| global.imagePullSecrets | list | `[]` | Reference to one or more secrets to be used when pulling images. For example: imagePullSecrets: - name: "image-pull-secret" |
| ingress.annotations | object | `{}` | Ingress annotations |
Expand Down
2 changes: 1 addition & 1 deletion charts/zabbix/artifacthub-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/kedacore/external-scalers/blob/main/artifacthub/azure-cosmos-db/0.1.0/artifacthub-pkg.yml
# https://artifacthub.io/packages/keda-scaler/keda-official-external-scalers/external-scaler-azure-cosmos-db?modal=install

version: 6.0.0 # helm chart version
version: 6.1.0 # helm chart version
# LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy
appVersion: 7.0.5 # zabbix version
name: zabbix
Expand Down
14 changes: 14 additions & 0 deletions charts/zabbix/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,17 @@ Return the entire logic of setting PostgreSQL access related env vars for the co
{{- end }}
{{- end }}
{{- end -}}

{{/*
Render a piece of yaml that defines manifests
Usage:
{{ include "zabbix.tools.render" ( dict "value" .Values.path.to.value "context" $ ) }}
*/}}
{{- define "zabbix.tools.render" -}}
{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
{{- if contains "{{" $value }}
{{- tpl $value .context }}
{{- else }}
{{- $value }}
{{- end }}
{{- end -}}
4 changes: 4 additions & 0 deletions charts/zabbix/templates/extra-manifests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{{ range .Values.extraManifests }}
---
{{ include "zabbix.tools.render" (dict "value" . "context" $) }}
{{ end }}
3 changes: 3 additions & 0 deletions charts/zabbix/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1055,3 +1055,6 @@ rbac:
# resources:
# - nodes/proxy
# verbs: [ "get", "list", "watch" ]

# -- Extra arbitrary Kubernetes manifests to deploy within the release
extraManifests: []

0 comments on commit 2ee52c1

Please sign in to comment.