public/helm-charts
1
0
Fork 0
mirror of https://github.com/bjw-s-labs/helm-charts.git synced 2025-07-04 08:57:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(common): Make sure service.monitor is optional

Browse source
This commit is contained in:
Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs 2022-09-14 14:24:49 +02:00
parent 4d09009bf8
commit 0bbc5baca9
No known key found for this signature in database
GPG key ID: BC5E2BD907F9A8EC
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
charts/library/common/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
name: common name: common
description: Function library for Helm charts description: Function library for Helm charts
type: library type: library
version: 0.2.0 version: 0.2.1
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.16.0-0"
keywords: keywords:
- common - common
@ -13,6 +13,8 @@ maintainers:
email: me@bjw-s.dev email: me@bjw-s.dev
annotations: annotations:
artifacthub.io/changes: |- artifacthub.io/changes: |-
- kind: fixed
description: Make sure service.monitor is optional.
- kind: removed - kind: removed
description: BREAKING - Removed support for the `openvpn` and `wireguard` VPN types. description: BREAKING - Removed support for the `openvpn` and `wireguard` VPN types.
- kind: added - kind: added

2
charts/library/common/templates/_service.tpl
View file

@ -17,7 +17,7 @@ Renders the Service objects required by the chart.
{{- include "common.classes.service" $ | nindent 0 -}} {{- include "common.classes.service" $ | nindent 0 -}}
{{/* Include a serviceMonitor if required */}} {{/* Include a serviceMonitor if required */}}
{{- if $service.monitor.enabled | default false -}} {{- if ($service.monitor).enabled | default false -}}
{{- $_ := set $ "ObjectValues" (dict "serviceMonitor" $serviceValues.monitor) -}} {{- $_ := set $ "ObjectValues" (dict "serviceMonitor" $serviceValues.monitor) -}}
{{- $_ := set $.ObjectValues.serviceMonitor "nameOverride" $serviceValues.nameOverride -}} {{- $_ := set $.ObjectValues.serviceMonitor "nameOverride" $serviceValues.nameOverride -}}