From 06636fa2cb94408a00658bc5d6fb1e314429a8df Mon Sep 17 00:00:00 2001 From: Isaac Abadi Date: Thu, 31 Dec 2020 16:19:00 -0500 Subject: [PATCH] Added helper tpl to define variables used in template --- docker-compose/index.yaml | 6 +- docker-compose/templates/_helpers.tpl | 62 ++++++++++++++++++++ docker-compose/templates/ingress.yaml | 4 +- docker-compose/templates/service.yaml | 6 +- docker-compose/youtubedl-material-0.0.1.tgz | Bin 2684 -> 3221 bytes 5 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 docker-compose/templates/_helpers.tpl diff --git a/docker-compose/index.yaml b/docker-compose/index.yaml index f02d141..0f66a9e 100644 --- a/docker-compose/index.yaml +++ b/docker-compose/index.yaml @@ -2,9 +2,9 @@ apiVersion: v1 entries: youtubedl-material: - apiVersion: v1 - created: "2020-12-31T15:31:43.4246679-05:00" + created: "2020-12-31T16:18:15.8900481-05:00" description: A Material Design frontend for youtube-dl - digest: a2721c05b79a25a01749ecd1412497eae2af8fe5b9a927490141d604796dc8c2 + digest: 3b70a7b4d1d316735ae73525e2adde46301f4404099454fcc512201b39c8d64e home: https://github.com/Tzahi12345/YoutubeDL-Material/ icon: https://i.imgur.com/IKOlr0N.png keywords: @@ -19,4 +19,4 @@ entries: urls: - youtubedl-material-0.0.1.tgz version: 0.0.1 -generated: "2020-12-31T15:31:43.4236681-05:00" +generated: "2020-12-31T16:18:15.8890301-05:00" diff --git a/docker-compose/templates/_helpers.tpl b/docker-compose/templates/_helpers.tpl new file mode 100644 index 0000000..883b89e --- /dev/null +++ b/docker-compose/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "youtubedl-material.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "youtubedl-material.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "youtubedl-material.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "youtubedl-material.labels" -}} +helm.sh/chart: {{ include "youtubedl-material.chart" . }} +{{ include "youtubedl-material.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "youtubedl-material.selectorLabels" -}} +app.kubernetes.io/name: {{ include "youtubedl-material.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "youtubedl-material.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "youtubedl-material.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/docker-compose/templates/ingress.yaml b/docker-compose/templates/ingress.yaml index 2dc2d74..caf0d76 100644 --- a/docker-compose/templates/ingress.yaml +++ b/docker-compose/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "ytdl-material.fullname" . -}} +{{- $fullName := include "youtubedl-material.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 @@ -10,7 +10,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "ytdl-material.labels" . | nindent 4 }} + {{- include "youtubedl-material.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/docker-compose/templates/service.yaml b/docker-compose/templates/service.yaml index 2422025..3449a41 100644 --- a/docker-compose/templates/service.yaml +++ b/docker-compose/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "ytdl-material.fullname" . }} + name: {{ include "youtubedl-material.fullname" . }} labels: - {{- include "ytdl-material.labels" . | nindent 4 }} + {{- include "youtubedl-material.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: http selector: - {{- include "ytdl-material.selectorLabels" . | nindent 4 }} \ No newline at end of file + {{- include "youtubedl-material.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/docker-compose/youtubedl-material-0.0.1.tgz b/docker-compose/youtubedl-material-0.0.1.tgz index 5b18e9c5c4d5f221c937095dbe33694e3859a4a6..0112756c6f4bbb8d58c338c63935c3b1be547950 100644 GIT binary patch delta 3193 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 delta 2652 zcmV-i3ZwOv8T=HGJAYeWbK*D>pJ%G_9lCP&uv-PhCXhd_+N<+`lem@`3Y^KMZmzb3 zEkGCB@=9{DY;L~$m1G-iAdqZw%-jzBk|4FZ)$0DWTDCl+iAYA+4{9M2m=P2lwWo-Q z`V57^hxZ{()3lRjQ~lL6ZTYX(I@Leu$ET;q&ErP1b@D;eTYp-k@d31V(!Y@sE)e^m zy;;|?asMZTV)6+yPH1GngI@75_ZW$V`fb8>78B6HoJ=AZGa3mT`7ovove2pdL1juq zY`|2Am>Wk&6C$R`sP575$o(BniQYJFwvO&n_D;8!OFgO(PwL6Xkva({2~z{@pL+q* zoO&EhD))HyNPn5njYzwnmA3Ehn3*h+xn0%vsTyYdgW_7KBG1Ge?UQk`8y_nZTN2-pDyFS z(K_AZe;33tdmtV*4k`d*7Gne2LBa)Qc3(EdlnDdQw10!jL4`yUhB;TPI6|WU`v#0r zz_DyWQA7ojiGv&P^hGvJDHka_Ku!HJU?vKoRu8C$f|LOuMqhlYZ{;4Bt@u^5vi+ zdHy<1f`7n4AqL|oAdwd&K8C|Gnk9?eI}f2=7|0*IK4n6V%e7=lr!KS0f|HDa732Z#Skq$9zwd>g0cGW-80Xg1PAyxAIN7g z?;c0KQErvXp&;fw7m#as`)aS3yg6jctjlZu+;V>Hl(wf=(8m2g&(r_g{a-uLwUzx} z*Z2GXE~tF|&v&iFk&w-@aH@3rmCH-Dq_a3b^IQV}6LGIg?^SR6RwJfE#CI~KW3 zAU44w&3-ap&(9-_3hL3o0Jq)G8`Cw&**FfcCn(!)Vb0lo#?r6l|Bd)BnNafrM8X=1 zV;K;&SVj#OI1&#uNJ6Z7*Jp}t_-{6rp8qvYPg>d@|GS{2=YJ{u`*YuZQoe0V-+wN0 zK?T5LSe2J92{9Kaj17pAAXq?N;epWlJq=^ZagM#E2LR=mnx~jeJSri`64&!E=hxK7 zN?8pC82Pu12;7T2EGs%Ze_SW$!tk#Nmc?gYFAB=g1RJ1Vk_s0{B*7epN|2v^?0{^9$+L#B*ocnz6W_mUL6OP#nai7y4*#Dc_9{)R`Zvy`+rZ(a} z<=Er>-Raf%e;_{ILH)l!|L=yr3H+;=+KB&@V~_uLr&r+L$8kVsA&y>qIe%~q{+qhK z{QR$Ra=O3&vlA-fAH^|0nkRwI+}$PQ7hf$aIOPcULf?S4@%ct>)t}XMy3ZZzB~k+a zym}+hyX;uWRtb`FX=1 zx6b^tAKx!ctxrw!bi{BR5PuJG1N7oM0VO*`!kcyr%3h|93x))q%+fLGyN>}@=E(e( zLp0M-aF3)F7rnEa3h#v1Ic(WgFL#&n^Rq6K6qHu-WorqLJ1UE#`TfxR9XpO5jKZyh z)YoRW+q?ax-E%JN%U`Z3`8`iZxVv73DGg zBnbL6Al}S?!-c$cftUBC@4E^!pBuM$n>FuU?1^%xn;W4v_-mR(Wl5oI>8ra3M<|Yu z7LVvROl;+G{B`rUM*e-GXh*in?@n*ZkA}5pK&qN*) zX7Gq+e16$Q#k%QvQh!x?$zvWfsY?st{c=ym>k2=kFm*M|d7-?GnoE9tv)+QVO7c{|)`5wXgqo zL2J+d+4Y}&-M_i+pO;^G+C4lwKR-*i;q1eS^YgQ`f-l@L(tl5z&Bn?>Vf$pVWGjuJ z$p44}6nU7vG5M~+f7fnX&d_?l7~6vXhSpsE{->#H`|tmDLTwt)7@153G&KDz{ZI}T zAIcq64k~@jLc-Mzd%|Ig86M4G!cZizUxhKl80Z+hsSNQd2nr~gsrrIOKu7XCLZS&E z@Mt`foMK8iaDO@$kBDJFkq?M->JcQc4}O+86nsG@2M#}oDTc#gHsbI{rNqZ501|=h z%e&O|c$x@RJ2T=*8P)7Yo}5G89gvV@8su=cjG5`W7D71Y@K$I=0pS`ttoB zy?NZ)-~ZnU$&G@J$HbEfeYIFu+q$S!1~{g#|GTfV0~?P*WnH~lvN0RR7> Kr9Bz|OaK5V%T8JV