diff --git a/charts/gitea-sync/deploy.yaml b/charts/gitea-sync/deploy.yaml deleted file mode 100644 index 812c175..0000000 --- a/charts/gitea-sync/deploy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: gitea-sync -spec: - template: - spec: - containers: - - name: sync - image: nixery.dev/shell/curl/jq - command: - - bash - - -c - - |- - while true; do - /app/mirror.sh -m user -u zoriya - sleep 24h - done - env: - - name: GITEA_URL - value: http://gitea-http.gitea.svc:3000 - - name: ACCESS_TOKEN - valueFrom: - secretKeyRef: - name: gitea-sync - key: gitea-token - - name: GITHUB_TOKEN - valueFrom: - secretKeyRef: - name: gitea-sync - key: github-token - volumeMounts: - - name: scripts - mountPath: /app - volumes: - - name: scripts - configMap: - name: scripts - defaultMode: 0555 - diff --git a/charts/gitea-sync/job.yaml b/charts/gitea-sync/job.yaml new file mode 100644 index 0000000..f251940 --- /dev/null +++ b/charts/gitea-sync/job.yaml @@ -0,0 +1,41 @@ +apiVersion: batch/v1 +kind: CronJob +metadata: + name: gitea-sync +spec: + schedule: "@daily" + jobTemplate: + spec: + template: + spec: + restartPolicy: OnFailure + containers: + - name: sync + image: nixery.dev/shell/curl/jq + command: + - /app/mirror.sh + - -m + - user + - -u + - zoriya + env: + - name: GITEA_URL + value: http://gitea-http.gitea.svc:3000 + - name: ACCESS_TOKEN + valueFrom: + secretKeyRef: + name: gitea-sync + key: gitea-token + - name: GITHUB_TOKEN + valueFrom: + secretKeyRef: + name: gitea-sync + key: github-token + volumeMounts: + - name: scripts + mountPath: /app + volumes: + - name: scripts + configMap: + name: scripts + defaultMode: 0555 diff --git a/charts/gitea-sync/kustomization.yaml b/charts/gitea-sync/kustomization.yaml index 376877e..bb592bf 100644 --- a/charts/gitea-sync/kustomization.yaml +++ b/charts/gitea-sync/kustomization.yaml @@ -12,5 +12,5 @@ configMapGenerator: - ./mirror.sh resources: -- deploy.yaml +- job.yaml - secret.yaml diff --git a/charts/meelo/ytdlp/deploy.yaml b/charts/meelo/ytdlp/deploy.yaml deleted file mode 100644 index 054ff9e..0000000 --- a/charts/meelo/ytdlp/deploy.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: yt-dlp -spec: - template: - spec: - securityContext: - fsGroup: 1001 - runAsUser: 1001 - runAsGroup: 1001 - runAsNonRoot: true - fsGroupChangePolicy: OnRootMismatch - containers: - - name: ytdlp - image: nixery.dev/shell/yt-dlp - workingDir: /work - command: [/app/ytdlp-sync.sh] - env: - - name: OUT - value: /musics - - name: LIVES_OUT - value: /musics/lives - - name: URL - valueFrom: - secretKeyRef: - name: ytdlp - key: url - - name: LIVES_URL - valueFrom: - secretKeyRef: - name: ytdlp - key: livesUrl - volumeMounts: - - name: scripts - mountPath: /app - readOnly: true - - name: cookies - mountPath: /app/secrets - - name: work - mountPath: /work - - name: musics - mountPath: /musics - volumes: - - name: scripts - configMap: - name: sync-scripts - defaultMode: 0555 - - name: musics - persistentVolumeClaim: - claimName: musics - - name: work - emptyDir: {} - - name: cookies - secret: - secretName: ytdlp diff --git a/charts/meelo/ytdlp/job.yaml b/charts/meelo/ytdlp/job.yaml new file mode 100644 index 0000000..243612b --- /dev/null +++ b/charts/meelo/ytdlp/job.yaml @@ -0,0 +1,60 @@ +apiVersion: batch/v1 +kind: CronJob +metadata: + name: yt-dlp +spec: + schedule: "@daily" + jobTemplate: + spec: + template: + spec: + securityContext: + fsGroup: 1001 + runAsUser: 1001 + runAsGroup: 1001 + runAsNonRoot: true + fsGroupChangePolicy: OnRootMismatch + restartPolicy: OnFailure + containers: + - name: ytdlp + image: nixery.dev/shell/yt-dlp + workingDir: /work + command: [/app/ytdlp-sync.sh] + env: + - name: OUT + value: /musics + - name: LIVES_OUT + value: /musics/lives + - name: URL + valueFrom: + secretKeyRef: + name: ytdlp + key: url + - name: LIVES_URL + valueFrom: + secretKeyRef: + name: ytdlp + key: livesUrl + volumeMounts: + - name: scripts + mountPath: /app + readOnly: true + - name: cookies + mountPath: /app/secrets + - name: work + mountPath: /work + - name: musics + mountPath: /musics + volumes: + - name: scripts + configMap: + name: sync-scripts + defaultMode: 0555 + - name: musics + persistentVolumeClaim: + claimName: musics + - name: work + emptyDir: {} + - name: cookies + secret: + secretName: ytdlp diff --git a/charts/meelo/ytdlp/kustomization.yaml b/charts/meelo/ytdlp/kustomization.yaml index 0f45baa..d950401 100644 --- a/charts/meelo/ytdlp/kustomization.yaml +++ b/charts/meelo/ytdlp/kustomization.yaml @@ -12,5 +12,5 @@ configMapGenerator: - ./ytdlp-sync.sh resources: -- ./deploy.yaml +- ./job.yaml - ./secret.yaml diff --git a/charts/meelo/ytdlp/ytdlp-sync.sh b/charts/meelo/ytdlp/ytdlp-sync.sh index 8186806..5b0902a 100644 --- a/charts/meelo/ytdlp/ytdlp-sync.sh +++ b/charts/meelo/ytdlp/ytdlp-sync.sh @@ -1,17 +1,14 @@ #!/usr/bin/env bash -while true; do - yt-dlp "$LIVES_URL" -o "$LIVES_OUT/%(title)s.%(ext)s" \ - --embed-thumbnail --embed-metadata --embed-chapters \ - --download-archive "$LIVES_OUT/ytdlp-archive.txt" \ - --cookies /app/secrets/cookies.txt \ - --cache-dir "$(pwd)" +yt-dlp "$LIVES_URL" -o "$LIVES_OUT/%(title)s.%(ext)s" \ + --embed-thumbnail --embed-metadata --embed-chapters \ + --download-archive "$LIVES_OUT/ytdlp-archive.txt" \ + --cookies /app/secrets/cookies.txt \ + --cache-dir "$(pwd)" - yt-dlp "$URL" -o "$OUT/%(artist)s - %(title)s.%(ext)s" \ - --extract-audio \ - --embed-thumbnail --embed-metadata --embed-chapters \ - --download-archive "$OUT/ytdlp-archive.txt" \ - --cookies /app/secrets/cookies.txt \ - --cache-dir "$(pwd)" - sleep 6h -done +yt-dlp "$URL" -o "$OUT/%(artist)s - %(title)s.%(ext)s" \ + --extract-audio \ + --embed-thumbnail --embed-metadata --embed-chapters \ + --download-archive "$OUT/ytdlp-archive.txt" \ + --cookies /app/secrets/cookies.txt \ + --cache-dir "$(pwd)"