feat(common)!: Release version 1.0.0 (#68)

- Removed: **BREAKING**: Removed support for HorizontalPodAutoscaler
- Added: Support services have extraSelectorLabels (#58)
- Added: support for `httpGet` probes
- Added: support for setting labels / annotations on volumeClaimTemplates
- Changed: **BREAKING**: Restructure of template components. All Helm templates have been renamed / namespaced. E.g. `common.values.setup` has now become `bjw-s.common.loader.init`.
- Changed: **BREAKING**: Raised minimum supported k8s version to 1.22
- Changed: **BREAKING**: Renamed `configmap` key to `configMaps`
- Changed: **BREAKING**: Moved `serviceMonitor` from `service` to its own key
- Changed: **BREAKING**: Renamed `secret` key to `secrets`, which now works similar to `configMaps`
- Changed: Updated code-server image to v4.8.2
- Changed: Updated gluetun image to v3.32.0
- Fixed: Fix NOTES always showing ingress protocol as http (#62)

Signed-off-by: Gavin Mogan <git@gavinmogan.com>
Co-authored-by: Gavin Mogan <github@gavinmogan.com>
Co-authored-by: Gabe Cook <gabe565@gmail.com>

charts/library/common/templates/addons/code-server/_addon.tpl

@@ -0,0 +1,40 @@
+{{/*
+Template to render code-server addon
+It will include / inject the required templates based on the given values.
+*/}}
+{{- define "bjw-s.common.addon.codeserver" -}}
+  {{- if .Values.addons.codeserver.enabled -}}
+    {{/* Append the code-server container to the additionalContainers */}}
+    {{- $container := include "bjw-s.common.addon.codeserver.container" . | fromYaml -}}
+    {{- if $container -}}
+      {{- $_ := set .Values.additionalContainers "addon-codeserver" $container -}}
+    {{- end -}}
+
+    {{/* Include the deployKeySecret if not empty */}}
+    {{- if or .Values.addons.codeserver.git.deployKey .Values.addons.codeserver.git.deployKeyBase64 -}}
+      {{- $deployKeySecret := include "bjw-s.common.addon.codeserver.deployKeySecret" . -}}
+      {{- if $deployKeySecret -}}
+        {{- $_ := set .Values.secrets "addon-codeserver-deploykey" (dict "enabled" "true" "stringData" ($deployKeySecret | fromYaml)) -}}
+      {{- end -}}
+    {{- end -}}
+
+    {{/* Append the secret volume to the volumes */}}
+    {{- if or .Values.addons.codeserver.git.deployKey .Values.addons.codeserver.git.deployKeyBase64 .Values.addons.codeserver.git.deployKeySecret }}
+      {{- $volume := include "bjw-s.common.addon.codeserver.deployKeyVolumeSpec" . | fromYaml -}}
+      {{- if $volume -}}
+        {{- $_ := set .Values.persistence "deploykey" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $volume) -}}
+      {{- end -}}
+    {{- end -}}
+
+    {{/* Add the code-server service */}}
+    {{- $_ := set .Values.service "addon-codeserver" .Values.addons.codeserver.service -}}
+
+    {{/* Add the code-server ingress */}}
+    {{- $svcName := printf "%v-addon-codeserver" (include "bjw-s.common.lib.chart.names.fullname" .) -}}
+    {{- $svcPort := .Values.addons.codeserver.service.ports.codeserver.port -}}
+    {{- range $_, $host := .Values.addons.codeserver.ingress.hosts -}}
+      {{- $_ := set (index $host.paths 0) "service" (dict "name" $svcName "port" $svcPort) -}}
+    {{- end -}}
+    {{- $_ := set .Values.ingress "addon-codeserver" .Values.addons.codeserver.ingress -}}
+  {{- end -}}
+{{- end -}}

charts/library/common/templates/addons/code-server/_codeserver.tpl

@@ -1,50 +0,0 @@
-{{/*
-Template to render code-server addon
-It will include / inject the required templates based on the given values.
-*/}}
-{{- define "common.addon.codeserver" -}}
-{{- if .Values.addons.codeserver.enabled -}}
-  {{/* Append the code-server container to the additionalContainers */}}
-  {{- $container := include "common.addon.codeserver.container" . | fromYaml -}}
-  {{- if $container -}}
-    {{- $_ := set .Values.additionalContainers "addon-codeserver" $container -}}
-  {{- end -}}
-
-  {{/* Include the deployKeySecret if not empty */}}
-  {{- $secret := include "common.addon.codeserver.deployKeySecret" . -}}
-  {{- if $secret -}}
-    {{- $secret | nindent 0 -}}
-  {{- end -}}
-
-  {{/* Append the secret volume to the volumes */}}
-  {{- $volume := include "common.addon.codeserver.deployKeyVolumeSpec" . | fromYaml -}}
-  {{- if $volume -}}
-    {{- $_ := set .Values.persistence "deploykey" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $volume) -}}
-  {{- end -}}
-
-  {{/* Add the code-server service */}}
-  {{- if .Values.addons.codeserver.service.enabled -}}
-    {{- $serviceValues := .Values.addons.codeserver.service -}}
-    {{- $_ := set $serviceValues "nameOverride" "codeserver" -}}
-    {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}}
-    {{- include "common.classes.service" $ -}}
-    {{- $_ := unset $ "ObjectValues" -}}
-  {{- end -}}
-
-  {{/* Add the code-server ingress */}}
-  {{- if .Values.addons.codeserver.ingress.enabled -}}
-    {{- $ingressValues := .Values.addons.codeserver.ingress -}}
-    {{- $_ := set $ingressValues "nameOverride" "codeserver" -}}
-
-    {{/* Determine the target service name & port */}}
-    {{- $svcName := printf "%v-codeserver" (include "common.names.fullname" .) -}}
-    {{- $svcPort := .Values.addons.codeserver.service.ports.codeserver.port -}}
-    {{- range $_, $host := $ingressValues.hosts -}}
-      {{- $_ := set (index $host.paths 0) "service" (dict "name" $svcName "port" $svcPort) -}}
-    {{- end -}}
-    {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}}
-    {{- include "common.classes.ingress" $ -}}
-    {{- $_ := unset $ "ObjectValues" -}}
-  {{- end -}}
-{{- end -}}
-{{- end -}}

charts/library/common/templates/addons/code-server/_container.tpl

@@ -1,7 +1,7 @@
 {{/*
 The code-server sidecar container to be inserted.
 */}}
-{{- define "common.addon.codeserver.container" -}}
+{{- define "bjw-s.common.addon.codeserver.container" -}}
 {{- if lt (len .Values.addons.codeserver.volumeMounts) 1 }}
 {{- fail "At least 1 volumeMount is required for codeserver container" }}
 {{- end -}}

charts/library/common/templates/addons/code-server/_secret.tpl

@@ -1,22 +1,10 @@
 {{/*
-The OpenVPN credentials secrets to be included.
+The deployKey secret to be included.
 */}}
-{{- define "common.addon.codeserver.deployKeySecret" -}}
-{{- if or .Values.addons.codeserver.git.deployKey .Values.addons.codeserver.git.deployKeyBase64 }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "common.names.fullname" . }}-deploykey
-  labels: {{- include "common.labels" $ | nindent 4 }}
-  annotations: {{- include "common.annotations" $ | nindent 4 }}
-type: Opaque
-{{- if .Values.addons.codeserver.git.deployKey }}
-stringData:
-  id_rsa: {{ .Values.addons.codeserver.git.deployKey | quote }}
-{{- else }}
-data:
-  id_rsa: {{ .Values.addons.codeserver.git.deployKeyBase64 | quote }}
-{{- end }}
-{{- end }}
+{{- define "bjw-s.common.addon.codeserver.deployKeySecret" -}}
+  {{- $deployKeyValue := .Values.addons.codeserver.git.deployKey -}}
+  {{- if .Values.addons.codeserver.git.deployKeyBase64 -}}
+    {{- $deployKeyValue = .Values.addons.codeserver.git.deployKeyBase64 | b64dec -}}
+  {{- end -}}
+id_rsa: {{ $deployKeyValue | quote }}
 {{- end -}}

charts/library/common/templates/addons/code-server/_volume.tpl

@@ -1,17 +1,15 @@
 {{/*
 The volume (referencing git deploykey) to be inserted into additionalVolumes.
 */}}
-{{- define "common.addon.codeserver.deployKeyVolumeSpec" -}}
-{{- if or .Values.addons.codeserver.git.deployKey .Values.addons.codeserver.git.deployKeyBase64 .Values.addons.codeserver.git.deployKeySecret }}
+{{- define "bjw-s.common.addon.codeserver.deployKeyVolumeSpec" -}}
 secret:
   {{- if .Values.addons.codeserver.git.deployKeySecret }}
   secretName: {{ .Values.addons.codeserver.git.deployKeySecret }}
   {{- else }}
-  secretName: {{ include "common.names.fullname" . }}-deploykey
+  secretName: {{ include "bjw-s.common.lib.chart.names.fullname" . }}-addon-codeserver-deploykey
   {{- end }}
   defaultMode: {{ "0400" | toDecimal }}
   items:
     - key: id_rsa
       path: id_rsa
 {{- end -}}
-{{- end -}}

charts/library/common/templates/addons/netshoot/_addon.tpl

@@ -2,10 +2,10 @@
 Template to render netshoot addon
 It will include / inject the required templates based on the given values.
 */}}
-{{- define "common.addon.netshoot" -}}
+{{- define "bjw-s.common.addon.netshoot" -}}
 {{- if .Values.addons.netshoot.enabled -}}
   {{/* Append the netshoot container to the additionalContainers */}}
-  {{- $container := include "common.addon.netshoot.container" . | fromYaml -}}
+  {{- $container := include "bjw-s.common.addon.netshoot.container" . | fromYaml -}}
   {{- if $container -}}
     {{- $_ := set .Values.additionalContainers "addon-netshoot" $container -}}
   {{- end -}}

charts/library/common/templates/addons/netshoot/_container.tpl

@@ -1,7 +1,7 @@
 {{/*
 The netshoot sidecar container to be inserted.
 */}}
-{{- define "common.addon.netshoot.container" -}}
+{{- define "bjw-s.common.addon.netshoot.container" -}}
 name: netshoot
 image: "{{ .Values.addons.netshoot.image.repository }}:{{ .Values.addons.netshoot.image.tag }}"
 imagePullPolicy: {{ .Values.addons.netshoot.pullPolicy }}

charts/library/common/templates/addons/promtail/_addon.tpl

@@ -0,0 +1,25 @@
+{{/*
+Template to render promtail addon
+It will include / inject the required templates based on the given values.
+*/}}
+{{- define "bjw-s.common.addon.promtail" -}}
+{{- if .Values.addons.promtail.enabled -}}
+  {{/* Append the promtail container to the additionalContainers */}}
+  {{- $container := include "bjw-s.common.addon.promtail.container" . | fromYaml -}}
+  {{- if $container -}}
+    {{- $_ := set .Values.additionalContainers "addon-promtail" $container -}}
+  {{- end -}}
+
+  {{/* Append the promtail configMap to the configmaps dict */}}
+  {{- $configmap := include "bjw-s.common.addon.promtail.configmap" . -}}
+  {{- if $configmap -}}
+    {{- $_ := set .Values.configMaps "addon-promtail" (dict "enabled" "true" "data" ($configmap | fromYaml)) -}}
+  {{- end -}}
+
+  {{/* Append the promtail config volume to the volumes */}}
+  {{- $volume := include "bjw-s.common.addon.promtail.volumeSpec" . | fromYaml -}}
+  {{- if $volume -}}
+    {{- $_ := set .Values.persistence "addon-promtail" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $volume) -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}

charts/library/common/templates/addons/promtail/_configmap.tpl

@@ -1,35 +1,25 @@
 {{/*
 The promtail config to be included.
 */}}
-{{- define "common.addon.promtail.configmap" -}}
-{{- if .Values.addons.promtail.enabled }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.names.fullname" . }}-promtail
-  labels: {{- include "common.labels" $ | nindent 4 }}
-  annotations: {{- include "common.annotations" $ | nindent 4 }}
-data:
-  promtail.yaml: |
-    server:
-      http_listen_port: 9080
-      grpc_listen_port: 0
-    positions:
-      filename: /tmp/positions.yaml
-    {{- with .Values.addons.promtail.loki }}
-    client:
-      url: {{ . }}
-    {{- end }}
-    scrape_configs:
-    {{- range .Values.addons.promtail.logs }}
-    - job_name: {{ .name }}
-      static_configs:
-      - targets:
-          - localhost
-        labels:
-          job: {{ .name }}
-          __path__: "{{ .path }}"
-    {{- end }}
-{{- end -}}
+{{- define "bjw-s.common.addon.promtail.configmap" -}}
+promtail.yaml: |
+  server:
+    http_listen_port: 9080
+    grpc_listen_port: 0
+  positions:
+    filename: /tmp/positions.yaml
+  {{- with .Values.addons.promtail.loki }}
+  client:
+    url: {{ . }}
+  {{- end }}
+  scrape_configs:
+  {{- range .Values.addons.promtail.logs }}
+  - job_name: {{ .name }}
+    static_configs:
+    - targets:
+        - localhost
+      labels:
+        job: {{ .name }}
+        __path__: "{{ .path }}"
+  {{- end }}
 {{- end -}}

charts/library/common/templates/addons/promtail/_container.tpl

@@ -1,7 +1,7 @@
 {{/*
 The promtail sidecar container to be inserted.
 */}}
-{{- define "common.addon.promtail.container" -}}
+{{- define "bjw-s.common.addon.promtail.container" -}}
 {{- if lt (len .Values.addons.promtail.volumeMounts) 1 }}
 {{- fail "At least 1 volumeMount is required for the promtail container" }}
 {{- end -}}
@@ -25,7 +25,7 @@ args:
 {{- end }}
 - "-config.file=/etc/promtail/promtail.yaml"
 volumeMounts:
-  - name: promtail-config
+  - name: addon-promtail
     mountPath: /etc/promtail/promtail.yaml
     subPath: promtail.yaml
     readOnly: true

charts/library/common/templates/addons/promtail/_promtail.tpl

@@ -1,25 +0,0 @@
-{{/*
-Template to render promtail addon
-It will include / inject the required templates based on the given values.
-*/}}
-{{- define "common.addon.promtail" -}}
-{{- if .Values.addons.promtail.enabled -}}
-  {{/* Append the promtail container to the additionalContainers */}}
-  {{- $container := include "common.addon.promtail.container" . | fromYaml -}}
-  {{- if $container -}}
-    {{- $_ := set .Values.additionalContainers "addon-promtail" $container -}}
-  {{- end -}}
-
-  {{/* Include the configmap if not empty */}}
-  {{- $configmap := include "common.addon.promtail.configmap" . -}}
-  {{- if $configmap -}}
-    {{- $configmap | nindent 0 -}}
-  {{- end -}}
-
-  {{/* Append the promtail config volume to the volumes */}}
-  {{- $volume := include "common.addon.promtail.volumeSpec" . | fromYaml -}}
-  {{- if $volume -}}
-    {{- $_ := set .Values.persistence "promtail-config" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $volume) -}}
-  {{- end -}}
-{{- end -}}
-{{- end -}}

charts/library/common/templates/addons/promtail/_volume.tpl

@@ -1,7 +1,7 @@
 {{/*
 The volume (referencing config) to be inserted into additionalVolumes.
 */}}
-{{- define "common.addon.promtail.volumeSpec" -}}
+{{- define "bjw-s.common.addon.promtail.volumeSpec" -}}
 configMap:
-  name: {{ include "common.names.fullname" . }}-promtail
+  name: {{ include "bjw-s.common.lib.chart.names.fullname" . }}-addon-promtail
 {{- end -}}

charts/library/common/templates/addons/vpn/_addon.tpl

@@ -2,46 +2,42 @@
 Template to render VPN addon
 It will include / inject the required templates based on the given values.
 */}}
-{{- define "common.addon.vpn" -}}
+{{- define "bjw-s.common.addon.vpn" -}}
 {{- if .Values.addons.vpn.enabled -}}
-  {{- if eq "openvpn" .Values.addons.vpn.type -}}
-    {{- fail "The 'openvpn' VPN type is no longer supported. Please migrate to the 'gluetun' type." }}
-  {{- end -}}
-
-  {{- if eq "wireguard" .Values.addons.vpn.type -}}
-    {{- fail "The 'wireguard' VPN type is no longer supported. Please migrate to the 'gluetun' type." }}
-  {{- end -}}
-
   {{- if eq "gluetun" .Values.addons.vpn.type -}}
-    {{- include "common.addon.gluetun" . }}
+    {{- include "bjw-s.common.addon.gluetun" . }}
   {{- end -}}
 
   {{/* Include the configmap if not empty */}}
-  {{- $configmap := include "common.addon.vpn.configmap" . -}}
-  {{- if $configmap -}}
-    {{- $configmap | nindent 0 -}}
+  {{- if or .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down }}
+    {{- $configmap := include "bjw-s.common.addon.vpn.configmap" . -}}
+    {{- if $configmap -}}
+      {{- $_ := set .Values.configMaps "addon-vpn" (dict "enabled" "true" "data" ($configmap | fromYaml)) -}}
+    {{- end -}}
   {{- end -}}
 
   {{/* Include the secret if not empty */}}
-  {{- $secret := include "common.addon.vpn.secret" . -}}
-  {{- if $secret -}}
-    {{- $secret | nindent 0 -}}
+  {{- if and .Values.addons.vpn.configFile (not .Values.addons.vpn.configFileSecret) }}
+    {{- $secret := include "bjw-s.common.addon.vpn.secret" . -}}
+    {{- if $secret -}}
+      {{- $_ := set .Values.secrets "addon-vpn-config" (dict "enabled" "true" "stringData" ($secret | fromYaml)) -}}
+    {{- end -}}
   {{- end -}}
 
   {{/* Append the vpn scripts volume to the volumes */}}
-  {{- $scriptVolume := include "common.addon.vpn.scriptsVolumeSpec" . | fromYaml -}}
+  {{- $scriptVolume := include "bjw-s.common.addon.vpn.scriptsVolumeSpec" . | fromYaml -}}
   {{- if $scriptVolume -}}
     {{- $_ := set .Values.persistence "vpnscript" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $scriptVolume) -}}
   {{- end -}}
 
   {{/* Append the vpn config volume to the volumes */}}
-  {{- $configVolume := include "common.addon.vpn.configVolumeSpec" . | fromYaml }}
+  {{- $configVolume := include "bjw-s.common.addon.vpn.configVolumeSpec" . | fromYaml }}
   {{ if $configVolume -}}
     {{- $_ := set .Values.persistence "vpnconfig" (dict "enabled" "true" "mountPath" "-" "type" "custom" "volumeSpec" $configVolume) -}}
   {{- end -}}
 
   {{/* Include the networkpolicy if not empty */}}
-  {{- $networkpolicy := include "common.addon.vpn.networkpolicy" . -}}
+  {{- $networkpolicy := include "bjw-s.common.addon.vpn.networkpolicy" . -}}
   {{- if $networkpolicy -}}
     {{- $networkpolicy | nindent 0 -}}
   {{- end -}}

charts/library/common/templates/addons/vpn/_configmap.tpl

@@ -1,23 +1,14 @@
 {{/*
 The VPN config and scripts to be included.
 */}}
-{{- define "common.addon.vpn.configmap" -}}
-{{- if or .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.names.fullname" . }}-vpn
-  labels: {{- include "common.labels" $ | nindent 4 }}
-  annotations: {{- include "common.annotations" $ | nindent 4 }}
-data:
+{{- define "bjw-s.common.addon.vpn.configmap" -}}
 {{- with .Values.addons.vpn.scripts.up }}
-  up.sh: |-
-    {{- . | nindent 4}}
+up.sh: |-
+  {{- . | nindent 2}}
 {{- end }}
+
 {{- with .Values.addons.vpn.scripts.down }}
-  down.sh: |-
-    {{- . | nindent 4}}
-{{- end }}
+down.sh: |-
+  {{- . | nindent 2}}
 {{- end -}}
 {{- end -}}

charts/library/common/templates/addons/vpn/_networkpolicy.tpl

@@ -1,22 +1,22 @@
 {{/*
 Blueprint for the NetworkPolicy object that can be included in the addon.
 */}}
-{{- define "common.addon.vpn.networkpolicy" -}}
+{{- define "bjw-s.common.addon.vpn.networkpolicy" -}}
 {{- if .Values.addons.vpn.networkPolicy.enabled }}
 ---
 kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
-  name: {{ include "common.names.fullname" . }}
-  {{- with (merge (.Values.addons.vpn.networkPolicy.labels | default dict) (include "common.labels" $ | fromYaml)) }}
+  name: {{ include "bjw-s.common.lib.chart.names.fullname" . }}
+  {{- with (merge (.Values.addons.vpn.networkPolicy.labels | default dict) (include "bjw-s.common.lib.metadata.allLabels" $ | fromYaml)) }}
   labels: {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with (merge (.Values.addons.vpn.networkPolicy.annotations | default dict) (include "common.annotations" $ | fromYaml)) }}
+  {{- with (merge (.Values.addons.vpn.networkPolicy.annotations | default dict) (include "bjw-s.common.lib.metadata.globalAnnotations" $ | fromYaml)) }}
   annotations: {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   podSelector:
-    {{- with (merge .Values.addons.vpn.networkPolicy.podSelectorLabels (include "common.labels.selectorLabels" . | fromYaml)) }}
+    {{- with (merge .Values.addons.vpn.networkPolicy.podSelectorLabels (include "bjw-s.common.lib.metadata.selectorLabels" . | fromYaml)) }}
     matchLabels: {{- toYaml . | nindent 6 }}
     {{- end }}
   policyTypes:

charts/library/common/templates/addons/vpn/_secret.tpl

@@ -1,19 +1,9 @@
 {{/*
 The OpenVPN config secret to be included.
 */}}
-{{- define "common.addon.vpn.secret" -}}
-{{- if and .Values.addons.vpn.configFile (not .Values.addons.vpn.configFileSecret) }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.names.fullname" . }}-vpnconfig
-  labels: {{- include "common.labels" $ | nindent 4 }}
-  annotations: {{- include "common.annotations" $ | nindent 4 }}
-stringData:
-  {{- with .Values.addons.vpn.configFile }}
-  vpnConfigfile: |-
-    {{- . | nindent 4}}
-  {{- end }}
+{{- define "bjw-s.common.addon.vpn.secret" -}}
+{{- if and .Values.addons.vpn.configFile (not .Values.addons.vpn.configFileSecret) -}}
+vpnConfigfile: |-
+  {{- .Values.addons.vpn.configFile | nindent 2 }}
 {{- end -}}
 {{- end -}}

charts/library/common/templates/addons/vpn/_volume.tpl

@@ -1,10 +1,10 @@
 {{/*
 The volume (referencing VPN scripts) to be inserted into additionalVolumes.
 */}}
-{{- define "common.addon.vpn.scriptsVolumeSpec" -}}
+{{- define "bjw-s.common.addon.vpn.scriptsVolumeSpec" -}}
 {{- if or .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down -}}
 configMap:
-  name: {{ include "common.names.fullname" . }}-vpn
+  name: {{ include "bjw-s.common.lib.chart.names.fullname" . }}-addon-vpn
   items:
     {{- if .Values.addons.vpn.scripts.up }}
     - key: up.sh
@@ -22,13 +22,13 @@ configMap:
 {{/*
 The volume (referencing VPN config) to be inserted into additionalVolumes.
 */}}
-{{- define "common.addon.vpn.configVolumeSpec" -}}
+{{- define "bjw-s.common.addon.vpn.configVolumeSpec" -}}
 {{- if or .Values.addons.vpn.configFile .Values.addons.vpn.configFileSecret -}}
 secret:
   {{- if .Values.addons.vpn.configFileSecret }}
   secretName: {{ .Values.addons.vpn.configFileSecret }}
   {{- else }}
-  secretName: {{ include "common.names.fullname" . }}-vpnconfig
+  secretName: {{ include "bjw-s.common.lib.chart.names.fullname" . }}-addon-vpn-config
   {{- end }}
   items:
     - key: vpnConfigfile

charts/library/common/templates/addons/vpn/gluetun/_addon.tpl

@@ -2,9 +2,9 @@
 Template to render gluetun addon. It will add the container to the list of additionalContainers.
 */}}
 */}}
-{{- define "common.addon.gluetun" -}}
+{{- define "bjw-s.common.addon.gluetun" -}}
   {{/* Append the gluetun container to the additionalContainers */}}
-  {{- $container := fromYaml (include "common.addon.gluetun.container" .) -}}
+  {{- $container := fromYaml (include "bjw-s.common.addon.gluetun.container" .) -}}
   {{- if $container -}}
     {{- $_ := set .Values.additionalContainers "addon-gluetun" $container -}}
   {{- end -}}

charts/library/common/templates/addons/vpn/gluetun/_container.tpl

@@ -1,7 +1,7 @@
 {{/*
 The gluetun sidecar container to be inserted.
 */}}
-{{- define "common.addon.gluetun.container" -}}
+{{- define "bjw-s.common.addon.gluetun.container" -}}
 name: gluetun
 image: "{{ .Values.addons.vpn.gluetun.image.repository }}:{{ .Values.addons.vpn.gluetun.image.tag }}"
 imagePullPolicy: {{ .Values.addons.vpn.gluetun.pullPolicy }}