From be639def81b724699c7035f8d581a362d82bd5b5 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Tue, 9 Feb 2021 18:21:12 +0100 Subject: [PATCH] rename all custom scripts to common.custom.* --- library/common/Chart.yaml | 2 +- library/common/templates/_all.tpl | 4 ++-- library/common/templates/custom/_appService.tpl | 2 +- library/common/templates/custom/_appStorage.tpl | 8 ++++---- library/common/templates/custom/_appingress.tpl | 14 +++++++------- .../templates/custom/classes/_appAuthForward.tpl | 2 +- .../templates/custom/classes/_appIngressHTTP.tpl | 2 +- .../templates/custom/classes/_appIngressTCP.tpl | 2 +- .../templates/custom/classes/_appIngressUDP.tpl | 2 +- .../common/templates/lib/controller/_container.tpl | 2 +- .../common/templates/lib/controller/_volumes.tpl | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index 5ff09c712dc..c2b26728a01 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: common description: Function library for TrueCharts type: library -version: 0.11.2 +version: 0.11.3 # upstream_version: 2.4.0 keywords: - truecharts diff --git a/library/common/templates/_all.tpl b/library/common/templates/_all.tpl index 263a7824bb7..0ae814c1252 100644 --- a/library/common/templates/_all.tpl +++ b/library/common/templates/_all.tpl @@ -31,9 +31,9 @@ Main entrypoint for the common library chart. It will render all underlying temp {{- end -}} {{- print "---" | nindent 0 -}} {{ include "common.service" . | nindent 0 }} - {{ include "custom.appService" . | nindent 0 }} + {{ include "common.custom.appService" . | nindent 0 }} {{- print "---" | nindent 0 -}} {{ include "common.ingress" . | nindent 0 }} {{- print "---" | nindent 0 -}} - {{ include "custom.appIngress" . | nindent 0 }} + {{ include "common.custom.appIngress" . | nindent 0 }} {{- end -}} diff --git a/library/common/templates/custom/_appService.tpl b/library/common/templates/custom/_appService.tpl index 262a443167f..97a0994fad1 100644 --- a/library/common/templates/custom/_appService.tpl +++ b/library/common/templates/custom/_appService.tpl @@ -1,7 +1,7 @@ {{/* Renders the additioanl Service objects from appAdditionalServices */}} -{{- define "custom.appService" -}} +{{- define "common.custom.appService" -}} {{- /* Generate TrueNAS SCALE app services as required v1 */ -}} {{- if and .Values.appAdditionalServicesEnabled .Values.appAdditionalServices -}} {{- range $name, $srv := .Values.appAdditionalServices }} diff --git a/library/common/templates/custom/_appStorage.tpl b/library/common/templates/custom/_appStorage.tpl index 1908fe0552d..f74eb9a8c4b 100644 --- a/library/common/templates/custom/_appStorage.tpl +++ b/library/common/templates/custom/_appStorage.tpl @@ -1,7 +1,7 @@ {{/* Retrieve host path from ix volumes based on dataset name */}} -{{- define "retrieveHostPathFromiXVolume" -}} +{{- define "common.custom.retrieveHostPathFromiXVolume" -}} {{- range $index, $hostPathConfiguration := $.ixVolumes }} {{- $dsName := base $hostPathConfiguration.hostPath -}} {{- if eq $.datasetName $dsName -}} @@ -13,7 +13,7 @@ Retrieve host path from ix volumes based on dataset name {{/* Define appVolumeMounts for container */}} -{{- define "configuredAppVolumeMounts" -}} +{{- define "common.custom.configuredAppVolumeMounts" -}} {{- if and .Values.appVolumesEnabled .Values.appVolumeMounts }} {{- range $name, $avm := .Values.appVolumeMounts -}} {{- if $avm.enabled }} @@ -30,7 +30,7 @@ Define appVolumeMounts for container {{/* Define hostPath for appVolumes */}} -{{- define "configuredAppVolumes" -}} +{{- define "common.custom.configuredAppVolumes" -}} {{- if and .Values.appVolumesEnabled .Values.appVolumeMounts }} {{- range $name, $av := .Values.appVolumeMounts -}} {{- if $av.enabled }} @@ -43,7 +43,7 @@ Define hostPath for appVolumes path: {{ required "hostPath not set" $av.hostPath }} {{- else }} {{- $volDict := dict "datasetName" $av.datasetName "ixVolumes" $.Values.ixVolumes -}} - path: {{ include "retrieveHostPathFromiXVolume" $volDict }} + path: {{ include "common.custom.retrieveHostPathFromiXVolume" $volDict }} {{- end }} {{- end }} {{- end }} diff --git a/library/common/templates/custom/_appingress.tpl b/library/common/templates/custom/_appingress.tpl index 8e4f39b4234..114a9167a3d 100644 --- a/library/common/templates/custom/_appingress.tpl +++ b/library/common/templates/custom/_appingress.tpl @@ -1,7 +1,7 @@ {{/* Renders the additional ingress objects from appIngress */}} -{{- define "custom.appIngress" -}} +{{- define "common.custom.appIngress" -}} {{- /* Generate TrueNAS SCALE app services as required v1 */ -}} {{- if .Values.appIngress -}} {{- range $name, $ingr := .Values.appIngress }} @@ -14,19 +14,19 @@ Renders the additional ingress objects from appIngress {{- $_ := set $ "ObjectValues" (dict "appIngress" $ingressValues) -}} {{- if $ingressValues.type -}} {{- if eq $ingressValues.type "UDP" -}} - {{- include "custom.classes.appIngressUDP" $ }} + {{- include "common.custom.classes.appIngressUDP" $ }} {{- else if eq $ingressValues.type "TCP" -}} - {{- include "custom.classes.appIngressTCP" $ }} + {{- include "common.custom.classes.appIngressTCP" $ }} {{- else }} - {{- include "custom.classes.appIngressHTTP" $ }} + {{- include "common.custom.classes.appIngressHTTP" $ }} {{- if $ingressValues.authForwardURL }} - {{- include "custom.classes.appAuthForward" $ }} + {{- include "common.custom.classes.appAuthForward" $ }} {{- end }} {{- end }} {{- else }} - {{- include "custom.classes.appIngressHTTP" $ }} + {{- include "common.custom.classes.appIngressHTTP" $ }} {{- if $ingressValues.authForwardURL }} - {{- include "custom.classes.appAuthForward" $ }} + {{- include "common.custom.classes.appAuthForward" $ }} {{- end }} {{- end }} {{- end }} diff --git a/library/common/templates/custom/classes/_appAuthForward.tpl b/library/common/templates/custom/classes/_appAuthForward.tpl index 17fac4ed19a..d7768c5d193 100644 --- a/library/common/templates/custom/classes/_appAuthForward.tpl +++ b/library/common/templates/custom/classes/_appAuthForward.tpl @@ -1,7 +1,7 @@ {{/* Renders the additioanl authForward objects from appAuthForward */}} -{{- define "custom.classes.appAuthForward" -}} +{{- define "common.custom.classes.appAuthForward" -}} {{- /* Generate TrueNAS SCALE app services as required v1 */ -}} {{- $values := .Values.appIngress -}} {{- if hasKey . "ObjectValues" -}} diff --git a/library/common/templates/custom/classes/_appIngressHTTP.tpl b/library/common/templates/custom/classes/_appIngressHTTP.tpl index 150e88060c3..c1aace246e2 100644 --- a/library/common/templates/custom/classes/_appIngressHTTP.tpl +++ b/library/common/templates/custom/classes/_appIngressHTTP.tpl @@ -2,7 +2,7 @@ This template serves as a blueprint for all appIngress objects that are created within the common library. */}} -{{- define "custom.classes.appIngressHTTP" -}} +{{- define "common.custom.classes.appIngressHTTP" -}} {{- $values := .Values.appIngress -}} {{- if hasKey . "ObjectValues" -}} {{- with .ObjectValues.appIngress -}} diff --git a/library/common/templates/custom/classes/_appIngressTCP.tpl b/library/common/templates/custom/classes/_appIngressTCP.tpl index 319f6d3f411..5a877010041 100644 --- a/library/common/templates/custom/classes/_appIngressTCP.tpl +++ b/library/common/templates/custom/classes/_appIngressTCP.tpl @@ -2,7 +2,7 @@ This template serves as a blueprint for all appIngressTCP objects that are created within the common library. */}} -{{- define "custom.classes.appIngressTCP" -}} +{{- define "common.custom.classes.appIngressTCP" -}} {{- $values := .Values.appIngress -}} {{- if hasKey . "ObjectValues" -}} {{- with .ObjectValues.appIngress -}} diff --git a/library/common/templates/custom/classes/_appIngressUDP.tpl b/library/common/templates/custom/classes/_appIngressUDP.tpl index d355bbb92f9..72b1e4f970c 100644 --- a/library/common/templates/custom/classes/_appIngressUDP.tpl +++ b/library/common/templates/custom/classes/_appIngressUDP.tpl @@ -2,7 +2,7 @@ This template serves as a blueprint for all appIngressTCP objects that are created within the common library. */}} -{{- define "custom.classes.appIngressUDP" -}} +{{- define "common.custom.classes.appIngressUDP" -}} {{- $values := .Values.appIngress -}} {{- if hasKey . "ObjectValues" -}} {{- with .ObjectValues.appIngress -}} diff --git a/library/common/templates/lib/controller/_container.tpl b/library/common/templates/lib/controller/_container.tpl index a9c389ea6a2..28b8010d511 100644 --- a/library/common/templates/lib/controller/_container.tpl +++ b/library/common/templates/lib/controller/_container.tpl @@ -54,7 +54,7 @@ The main container included in the controller. {{- end }} {{- end }} {{- end }} - {{- include "configuredAppVolumeMounts" . | indent 2 }} + {{- include "common.custom.configuredAppVolumeMounts" . | indent 2 }} {{- if .Values.additionalVolumeMounts }} {{- toYaml .Values.additionalVolumeMounts | nindent 2 }} {{- end }} diff --git a/library/common/templates/lib/controller/_volumes.tpl b/library/common/templates/lib/controller/_volumes.tpl index a4bcdc38b0b..991ef3a3a9d 100644 --- a/library/common/templates/lib/controller/_volumes.tpl +++ b/library/common/templates/lib/controller/_volumes.tpl @@ -25,7 +25,7 @@ Volumes included by the controller. {{- end }} {{- end }} {{- end }} -{{- include "configuredAppVolumes" . }} +{{- include "common.custom.configuredAppVolumes" . }} {{- if .Values.additionalVolumes }} {{- toYaml .Values.additionalVolumes | nindent 0 }} {{- end }}