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 5b18e9c..0112756 100644 Binary files a/docker-compose/youtubedl-material-0.0.1.tgz and b/docker-compose/youtubedl-material-0.0.1.tgz differ