From 85e2958be3eb12f499487f6bf1c8f1ddea3e3e16 Mon Sep 17 00:00:00 2001 From: Isaac Abadi Date: Thu, 31 Dec 2020 15:22:53 -0500 Subject: [PATCH] Added ingress and expandable storage support --- docker-compose/index.yaml | 6 +-- docker-compose/templates/ingress.yaml | 41 ++++++++++++++++++ docker-compose/templates/service.yaml | 15 +++++++ .../templates/ytdl-material-deployment.yaml | 2 +- docker-compose/values.yaml | 11 +++++ docker-compose/youtubedl-material-0.0.1.tgz | Bin 2080 -> 2684 bytes 6 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 docker-compose/templates/ingress.yaml create mode 100644 docker-compose/templates/service.yaml create mode 100644 docker-compose/values.yaml diff --git a/docker-compose/index.yaml b/docker-compose/index.yaml index 321f5bc..c82d62b 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:07:45.2073679-05:00" + created: "2020-12-31T15:22:31.8456098-05:00" description: A Material Design frontend for youtube-dl - digest: 71afe17fe75c49236b17b583d408260132a05f97a84bbb955ae3bcae6b41e9a9 + digest: 2cbf64b27dd86d945ce3a0ae58b904c3b6a1858552f9fdbf1e213ea73afbcf18 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:07:45.2023678-05:00" +generated: "2020-12-31T15:22:31.8445778-05:00" diff --git a/docker-compose/templates/ingress.yaml b/docker-compose/templates/ingress.yaml new file mode 100644 index 0000000..caf0d76 --- /dev/null +++ b/docker-compose/templates/ingress.yaml @@ -0,0 +1,41 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "youtubedl-material.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "youtubedl-material.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + backend: + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} \ No newline at end of file diff --git a/docker-compose/templates/service.yaml b/docker-compose/templates/service.yaml new file mode 100644 index 0000000..3449a41 --- /dev/null +++ b/docker-compose/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "youtubedl-material.fullname" . }} + labels: + {{- include "youtubedl-material.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "youtubedl-material.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/docker-compose/templates/ytdl-material-deployment.yaml b/docker-compose/templates/ytdl-material-deployment.yaml index 3f50188..6397d14 100644 --- a/docker-compose/templates/ytdl-material-deployment.yaml +++ b/docker-compose/templates/ytdl-material-deployment.yaml @@ -34,7 +34,7 @@ spec: imagePullPolicy: "" name: ytdl-material ports: - - containerPort: 17442 + - containerPort: http resources: {} volumeMounts: - mountPath: /app/appdata diff --git a/docker-compose/values.yaml b/docker-compose/values.yaml new file mode 100644 index 0000000..e539b69 --- /dev/null +++ b/docker-compose/values.yaml @@ -0,0 +1,11 @@ +service: + type: ClusterIP + port: 80 + +ingress: + enabled: false + annotations: {} + hosts: + - host: ytdl-material.local + paths: [] + tls: [] \ 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 2e9e844c3ed5a8273ceb23273ffc1397c2e4e507..86995c75ec7ffa5587a53559602e9203f0a2fdfc 100644 GIT binary patch delta 2652 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 ZmsCg+zW@LL|NoXSSi1l`000UZ8NUDk