restructure everything in media ns

spiceratops · Jan 2, 2024 · 738732c · 738732c
1 parent 593df4d
commit 738732c
Show file tree

Hide file tree

Showing 69 changed files with 729 additions and 362 deletions.
diff --git a/kubernetes/apps/media/autobrr/app/helmrelease.yaml b/kubernetes/apps/media/autobrr/app/helmrelease.yaml
@@ -74,15 +74,15 @@ spec:
  annotations:
  hajimari.io/icon: mdi:bunny
  hosts:
- - host: &host autobrr.${PRIVATE_DOMAIN}
+ - host: "${HOSTNAME}"
  paths:
  - path: /
  service:
  name: main
  port: http
  tls:
  - hosts:
- - *host
+ - "${HOSTNAME}"
  persistence:
  config:
  enabled: true

diff --git a/kubernetes/apps/media/autobrr/ks.yaml b/kubernetes/apps/media/autobrr/ks.yaml
@@ -2,10 +2,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
- name: cluster-apps-autobrr
+ name: &appname autobrr
  namespace: flux-system
 spec:
+ targetNamespace: media
+ commonMetadata:
+ labels:
+ app.kubernetes.io/name: *appname
  dependsOn:
+ - name: cluster-apps-volsync
+ - name: cluster-apps-rook-ceph-cluster
  - name: cluster-apps-cloudnative-pg-cluster
  - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/media/autobrr/app
@@ -17,3 +23,10 @@ spec:
  interval: 30m
  retryInterval: 1m
  timeout: 5m
+ postBuild:
+ substitute:
+ APP: *appname
+ HOSTNAME: autobrr.${PRIVATE_DOMAIN}
+ APP_UID: "568"
+ APP_GID: "568"
+ VOLSYNC_CLAIM: *appname
diff --git a/kubernetes/apps/media/bazarr/app/helmrelease.yaml b/kubernetes/apps/media/bazarr/app/helmrelease.yaml
@@ -96,21 +96,21 @@ spec:
  annotations:
  hajimari.io/icon: mdi:subtitles-outline
  hosts:
- - host: &host "bazarr.${PRIVATE_DOMAIN}"
+ - host: "${HOSTNAME}"
  paths:
  - path: /
  service:
  name: main
  port: http
  tls:
  - hosts:
- - *host
+ - "${HOSTNAME}"
  persistence:
  add-ons:
  type: emptyDir
  config:
  enabled: true
- existingClaim: bazarr-config
+ existingClaim: "${VOLSYNC_CLAIM}"
  config-cache:
  type: emptyDir
  globalMounts:

diff --git a/kubernetes/apps/media/bazarr/app/kustomization.yaml b/kubernetes/apps/media/bazarr/app/kustomization.yaml
@@ -3,17 +3,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: media
 resources:
- - ./pvc.yaml
+ - ./volsync.yaml
  - ./externalsecret.yaml
  - ./helmrelease.yaml
- - ./volsync.yaml
 configMapGenerator:
  - name: bazarr-scripts
  files:
  - ./scripts/post-process.sh
 generatorOptions:
  disableNameSuffixHash: true
-labels:
- - pairs:
- app.kubernetes.io/name: bazarr
- app.kubernetes.io/instance: bazarr
diff --git a/kubernetes/apps/media/bazarr/app/pvc.yaml b/kubernetes/apps/media/bazarr/app/pvc.yaml
diff --git a/kubernetes/apps/media/bazarr/app/volsync.yaml b/kubernetes/apps/media/bazarr/app/volsync.yaml
@@ -3,7 +3,6 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
  name: bazarr-restic
- namespace: media
 spec:
  secretStoreRef:
  kind: ClusterSecretStore
@@ -22,22 +21,60 @@ spec:
  - extract:
  key: volsync-restic-template
 ---
-apiVersion: volsync.backube/v1alpha1
-kind: ReplicationSource
+apiVersion: v1
+kind: PersistentVolumeClaim
 metadata:
  name: bazarr
- namespace: media
 spec:
- sourcePVC: bazarr-config
+ accessModes: ["ReadWriteOnce"]
+ dataSourceRef:
+ kind: ReplicationDestination
+ apiGroup: volsync.backube
+ name: bazarr-rdst
+ resources:
+ requests:
+ storage: 2Gi
+ storageClassName: ${CLUSTER_STORAGE_BLOCK}
+---
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationDestination
+metadata:
+ name: bazarr-rdst
+spec:
  trigger:
- schedule: "0 8 * * *"
+ manual: restore-once
  restic:
+ repository: bazarr-restic-secret
  copyMethod: Snapshot
+ accessModes: ["ReadWriteOnce"]
+ storageClassName: ${CLUSTER_STORAGE_BLOCK}
+ volumeSnapshotClassName: ${CLUSTER_SNAPSHOT_BLOCK}
+ cacheAccessModes: ["ReadWriteOnce"]
+ cacheCapacity: 8Gi
+ cacheStorageClassName: ${CLUSTER_STORAGE_HOSTPATH}
+ moverSecurityContext:
+ runAsUser: 568
+ runAsGroup: 568
+ fsGroup: 568
+ capacity: 2Gi # must match the PersistentVolumeClaim `.resources.requests.storage` size above
+---
+apiVersion: volsync.backube/v1alpha1
+kind: ReplicationSource
+metadata:
+ name: bazarr-rsrc
+spec:
+ sourcePVC: bazarr
+ trigger:
+ schedule: "15 */8 * * *"
+ restic:
  pruneIntervalDays: 10
  repository: bazarr-restic-secret
- cacheCapacity: 8Gi
- volumeSnapshotClassName: ${CLUSTER_SNAPSHOT_BLOCK}
+ copyMethod: Snapshot
+ accessModes: ["ReadWriteOnce"]
  storageClassName: ${CLUSTER_STORAGE_BLOCK}
+ volumeSnapshotClassName: ${CLUSTER_SNAPSHOT_BLOCK}
+ cacheAccessModes: ["ReadWriteOnce"]
+ cacheCapacity: 8Gi
  cacheStorageClassName: ${CLUSTER_STORAGE_HOSTPATH}
  moverSecurityContext:
  runAsUser: 568

diff --git a/kubernetes/apps/media/bazarr/ks.yaml b/kubernetes/apps/media/bazarr/ks.yaml
@@ -2,12 +2,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
- name: cluster-apps-bazarr
+ name: &appname bazarr
  namespace: flux-system
 spec:
+ targetNamespace: media
+ commonMetadata:
+ labels:
+ app.kubernetes.io/name: *appname
  dependsOn:
  - name: cluster-apps-volsync
- - name: cluster-apps-pvc-media-data
  - name: cluster-apps-rook-ceph-cluster
  - name: cluster-apps-cloudnative-pg-cluster
  - name: cluster-apps-external-secrets-stores
@@ -20,3 +23,10 @@ spec:
  interval: 30m
  retryInterval: 1m
  timeout: 5m
+ postBuild:
+ substitute:
+ APP: *appname
+ HOSTNAME: bazarr.${PRIVATE_DOMAIN}
+ APP_UID: "568"
+ APP_GID: "568"
+ VOLSYNC_CLAIM: *appname
diff --git a/kubernetes/apps/media/feishin/app/helmrelease.yaml b/kubernetes/apps/media/feishin/app/helmrelease.yaml
@@ -41,19 +41,19 @@ spec:
  annotations:
  hajimari.io/icon: mdi:headphones
  hosts:
- - host: &host "feishin.${PRIVATE_DOMAIN}"
+ - host: "${HOSTNAME}"
  paths:
  - path: /
  service:
  name: main
  port: http
  tls:
  - hosts:
- - *host
+ - "${HOSTNAME}"
  persistence:
  config:
  enabled: true
- existingClaim: *app
+ existingClaim: "${VOLSYNC_CLAIM}"
  service:
  main:
  ports:

diff --git a/kubernetes/apps/media/feishin/ks.yaml b/kubernetes/apps/media/feishin/ks.yaml
@@ -2,11 +2,18 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
- name: cluster-apps-feishin
+ name: &appname feishin
  namespace: flux-system
 spec:
+ targetNamespace: media
+ commonMetadata:
+ labels:
+ app.kubernetes.io/name: *appname
  dependsOn:
- - name: cluster-apps-navidrome
+ - name: cluster-apps-volsync
+ - name: cluster-apps-rook-ceph-cluster
+ - name: cluster-apps-external-secrets-stores
+ - name: navidrome
  path: ./kubernetes/apps/media/feishin/app
  prune: true
  sourceRef:
@@ -16,3 +23,10 @@ spec:
  interval: 30m
  retryInterval: 1m
  timeout: 5m
+ postBuild:
+ substitute:
+ APP: *appname
+ HOSTNAME: graves.${PRIVATE_DOMAIN}
+ APP_UID: "568"
+ APP_GID: "568"
+ VOLSYNC_CLAIM: *appname
diff --git a/kubernetes/apps/media/flaresolverr/ks.yaml b/kubernetes/apps/media/flaresolverr/ks.yaml
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
- name: cluster-apps-flaresolverr
+ name: &appname flaresolverr
  namespace: flux-system
 spec:
+ targetNamespace: media
+ commonMetadata:
+ labels:
+ app.kubernetes.io/name: *appname
  path: ./kubernetes/apps/media/flaresolverr/app
  prune: true
  sourceRef:
@@ -14,3 +18,10 @@ spec:
  interval: 30m
  retryInterval: 1m
  timeout: 5m
+ postBuild:
+ substitute:
+ APP: *appname
+ HOSTNAME: flaresolverr.${PRIVATE_DOMAIN}
+ APP_UID: "568"
+ APP_GID: "568"
+ VOLSYNC_CLAIM: *appname
diff --git a/kubernetes/apps/media/jellyfin/app/helmrelease.yaml b/kubernetes/apps/media/jellyfin/app/helmrelease.yaml
@@ -2,7 +2,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
- name: &app jellyfin
+ name: jellyfin
  namespace: media
 spec:
  interval: 30m

diff --git a/kubernetes/apps/media/jellyfin/app/volsync.yaml b/kubernetes/apps/media/jellyfin/app/volsync.yaml
@@ -24,7 +24,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
- name: jellyfin-config
+ name: jellyfin
 spec:
  accessModes: ["ReadWriteOnce"]
  dataSourceRef:

diff --git a/kubernetes/apps/media/jellyfin/ks.yaml b/kubernetes/apps/media/jellyfin/ks.yaml
@@ -11,7 +11,6 @@ spec:
  app.kubernetes.io/name: *appname
  dependsOn:
  - name: cluster-apps-volsync
- - name: cluster-apps-pvc-media-data
  - name: cluster-apps-rook-ceph-cluster
  - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/media/jellyfin/app
@@ -29,4 +28,4 @@ spec:
  HOSTNAME: jellyfin.${PRIVATE_DOMAIN}
  APP_UID: "568"
  APP_GID: "568"
- VOLSYNC_CLAIM: jellyfin-config
+ VOLSYNC_CLAIM: *appname
diff --git a/kubernetes/apps/media/jellyseer/app/helmrelease.yaml b/kubernetes/apps/media/jellyseer/app/helmrelease.yaml
@@ -2,7 +2,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
- name: &app jellyseer
+ name: jellyseer
  namespace: media
 spec:
  interval: 30m
@@ -43,7 +43,7 @@ spec:
  persistence:
  config:
  enabled: true
- existingClaim: jellyseer-config
+ existingClaim: "${VOLSYNC_CLAIM}"
  mountPath: /app/config
  service:
  main:
@@ -58,12 +58,12 @@ spec:
  hajimari.io/icon: mdi:eye-circle
  external-dns.alpha.kubernetes.io/target: external.${PRIVATE_DOMAIN}
  hosts:
- - host: &host "requests.${PRIVATE_DOMAIN}"
+ - host: "${HOSTNAME}"
  paths:
  - path: /
  service:
  name: main
  port: http
  tls:
  - hosts:
- - *host
+ - "${HOSTNAME}"
diff --git a/kubernetes/apps/media/jellyseer/app/kustomization.yaml b/kubernetes/apps/media/jellyseer/app/kustomization.yaml
@@ -3,10 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: media
 resources:
- - ./pvc.yaml
- - ./helmrelease.yaml
  - ./volsync.yaml
-labels:
- - pairs:
- app.kubernetes.io/name: jellyseer
- app.kubernetes.io/instance: jellyseer
+ - ./helmrelease.yaml
diff --git a/kubernetes/apps/media/jellyseer/app/pvc.yaml b/kubernetes/apps/media/jellyseer/app/pvc.yaml