From fe233d08f957c8c462e312c3054905fed236e51b Mon Sep 17 00:00:00 2001 From: alexlebens Date: Thu, 1 Aug 2024 22:31:09 -0500 Subject: [PATCH] replace calibre web with automated version --- .../templates/ingress-route.yaml | 4 +- .../applications/calibre-web/Chart.yaml | 21 ------- .../templates/external-secret.yaml | 57 ------------------- .../calibre-web/templates/ingress-route.yaml | 33 ----------- .../calibre-web/templates/middleware.yaml | 27 --------- .../templates/persistent-volume-claim.yaml | 19 ------- .../templates/persistent-volume.yaml | 25 -------- .../templates/replication-source.yaml | 27 --------- .../applications/calibre-web/values.yaml | 50 ---------------- .../cl01tl/applications/homepage/values.yaml | 4 +- 10 files changed, 4 insertions(+), 263 deletions(-) delete mode 100644 clusters/cl01tl/applications/calibre-web/Chart.yaml delete mode 100644 clusters/cl01tl/applications/calibre-web/templates/external-secret.yaml delete mode 100644 clusters/cl01tl/applications/calibre-web/templates/ingress-route.yaml delete mode 100644 clusters/cl01tl/applications/calibre-web/templates/middleware.yaml delete mode 100644 clusters/cl01tl/applications/calibre-web/templates/persistent-volume-claim.yaml delete mode 100644 clusters/cl01tl/applications/calibre-web/templates/persistent-volume.yaml delete mode 100644 clusters/cl01tl/applications/calibre-web/templates/replication-source.yaml delete mode 100644 clusters/cl01tl/applications/calibre-web/values.yaml diff --git a/clusters/cl01tl/applications/calibre-web-automated/templates/ingress-route.yaml b/clusters/cl01tl/applications/calibre-web-automated/templates/ingress-route.yaml index fd5fd5d59..52e6536f3 100644 --- a/clusters/cl01tl/applications/calibre-web-automated/templates/ingress-route.yaml +++ b/clusters/cl01tl/applications/calibre-web-automated/templates/ingress-route.yaml @@ -14,7 +14,7 @@ spec: - websecure routes: - kind: Rule - match: Host(`calibre-automated.alexlebens.net`) + match: Host(`calibre.alexlebens.net`) middlewares: - name: authentik-calibre-web-automated namespace: {{ .Release.Namespace }} @@ -24,7 +24,7 @@ spec: name: calibre-web-automated port: 80 - kind: Rule - match: Host(`calibre-automated.alexlebens.net`) && PathPrefix(`/outpost.goauthentik.io/`)" + match: Host(`calibre.alexlebens.net`) && PathPrefix(`/outpost.goauthentik.io/`)" priority: 15 services: - kind: Service diff --git a/clusters/cl01tl/applications/calibre-web/Chart.yaml b/clusters/cl01tl/applications/calibre-web/Chart.yaml deleted file mode 100644 index 5a513b777..000000000 --- a/clusters/cl01tl/applications/calibre-web/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v2 -name: calibre-web -version: 1.0.0 -description: Calibre Web -keywords: - - calibre-web - - books -home: https://wiki.alexlebens.dev/doc/calibre-web-60YmRJ4mPw -sources: - - https://github.com/janeczku/calibre-web - - https://github.com/linuxserver/docker-calibre-web/pkgs/container/calibre-web - - https://github.com/bjw-s/helm-charts/tree/main/charts/other/app-template -maintainers: - - name: alexlebens -dependencies: - - name: app-template - alias: calibre-web - repository: https://bjw-s.github.io/helm-charts/ - version: 3.2.1 -icon: https://raw.githubusercontent.com/walkxcode/dashboard-icons/main/png/calibre-web.png -appVersion: 0.6.21-ls270 diff --git a/clusters/cl01tl/applications/calibre-web/templates/external-secret.yaml b/clusters/cl01tl/applications/calibre-web/templates/external-secret.yaml deleted file mode 100644 index 568b70640..000000000 --- a/clusters/cl01tl/applications/calibre-web/templates/external-secret.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: calibre-web-config-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: calibre-web-config-backup-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: backup - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - target: - template: - mergePolicy: Merge - engineVersion: v2 - data: - RESTIC_REPOSITORY: "{{ `{{ .BUCKET_ENDPOINT }}` }}/calibre-web/calibre-web-config" - data: - - secretKey: BUCKET_ENDPOINT - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/volsync/restic/config - metadataPolicy: None - property: S3_BUCKET_ENDPOINT - - secretKey: RESTIC_PASSWORD - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/volsync/restic/config - metadataPolicy: None - property: RESTIC_PASSWORD - - secretKey: AWS_DEFAULT_REGION - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/volsync/restic/config - metadataPolicy: None - property: AWS_DEFAULT_REGION - - secretKey: AWS_ACCESS_KEY_ID - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /aws/keys/cl01tl-volsync-backups - metadataPolicy: None - property: access_key - - secretKey: AWS_SECRET_ACCESS_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /aws/keys/cl01tl-volsync-backups - metadataPolicy: None - property: secret_key diff --git a/clusters/cl01tl/applications/calibre-web/templates/ingress-route.yaml b/clusters/cl01tl/applications/calibre-web/templates/ingress-route.yaml deleted file mode 100644 index 15c9e040a..000000000 --- a/clusters/cl01tl/applications/calibre-web/templates/ingress-route.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: calibre-web - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: calibre-web - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - entryPoints: - - websecure - routes: - - kind: Rule - match: Host(`calibre.alexlebens.net`) - middlewares: - - name: authentik-calibre-web - namespace: {{ .Release.Namespace }} - priority: 10 - services: - - kind: Service - name: calibre-web - port: 80 - - kind: Rule - match: Host(`calibre.alexlebens.net`) && PathPrefix(`/outpost.goauthentik.io/`)" - priority: 15 - services: - - kind: Service - name: authentik-outpost-proxy - port: 9000 - namespace: authentik diff --git a/clusters/cl01tl/applications/calibre-web/templates/middleware.yaml b/clusters/cl01tl/applications/calibre-web/templates/middleware.yaml deleted file mode 100644 index f5afea29f..000000000 --- a/clusters/cl01tl/applications/calibre-web/templates/middleware.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: Middleware -metadata: - name: authentik-calibre-web - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: authentik-calibre-web - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: auth - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - forwardAuth: - address: http://authentik-outpost-proxy.authentik:9000/outpost.goauthentik.io/auth/traefik - trustForwardHeader: true - authResponseHeaders: - - X-authentik-username - - X-authentik-groups - - X-authentik-email - - X-authentik-name - - X-authentik-uid - - X-authentik-jwt - - X-authentik-meta-jwks - - X-authentik-meta-outpost - - X-authentik-meta-provider - - X-authentik-meta-app - - X-authentik-meta-version diff --git a/clusters/cl01tl/applications/calibre-web/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/calibre-web/templates/persistent-volume-claim.yaml deleted file mode 100644 index f5f0d3179..000000000 --- a/clusters/cl01tl/applications/calibre-web/templates/persistent-volume-claim.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: calibre-web-nfs-storage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: calibre-web-nfs-storage - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: storage - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - volumeName: calibre-web-nfs-storage - storageClassName: nfs-client - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi diff --git a/clusters/cl01tl/applications/calibre-web/templates/persistent-volume.yaml b/clusters/cl01tl/applications/calibre-web/templates/persistent-volume.yaml deleted file mode 100644 index ea4123a42..000000000 --- a/clusters/cl01tl/applications/calibre-web/templates/persistent-volume.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: calibre-web-nfs-storage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: calibre-web-nfs-storage - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: storage - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - persistentVolumeReclaimPolicy: Retain - storageClassName: nfs-client - capacity: - storage: 1Gi - accessModes: - - ReadWriteMany - nfs: - path: /volume2/Storage/Calibre - server: synologybond.alexlebens.net - mountOptions: - - vers=4 - - minorversion=1 - - noac diff --git a/clusters/cl01tl/applications/calibre-web/templates/replication-source.yaml b/clusters/cl01tl/applications/calibre-web/templates/replication-source.yaml deleted file mode 100644 index ab8737458..000000000 --- a/clusters/cl01tl/applications/calibre-web/templates/replication-source.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: volsync.backube/v1alpha1 -kind: ReplicationSource -metadata: - name: calibre-web-config-backup-source - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: calibre-web-config-backup-source - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: backup - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - sourcePVC: calibre-web-config - trigger: - schedule: 0 */6 * * * - restic: - pruneIntervalDays: 7 - repository: calibre-web-config-backup-secret - retain: - hourly: 1 - daily: 1 - weekly: 3 - monthly: 2 - yearly: 4 - copyMethod: Snapshot - storageClassName: ceph-block-delete - volumeSnapshotClassName: ceph-blockpool-snapshot diff --git a/clusters/cl01tl/applications/calibre-web/values.yaml b/clusters/cl01tl/applications/calibre-web/values.yaml deleted file mode 100644 index ab67f35b9..000000000 --- a/clusters/cl01tl/applications/calibre-web/values.yaml +++ /dev/null @@ -1,50 +0,0 @@ -calibre-web: - controllers: - main: - type: deployment - replicas: 1 - strategy: Recreate - revisionHistoryLimit: 3 - containers: - main: - image: - repository: ghcr.io/linuxserver/calibre-web - tag: 0.6.22-ls276 - pullPolicy: IfNotPresent - env: - - name: TZ - value: US/Central - - name: DOCKER_MODS - value: linuxserver/mods:universal-calibre - resources: - requests: - cpu: 100m - memory: 256Mi - serviceAccount: - create: true - service: - main: - controller: main - ports: - http: - port: 80 - targetPort: 8083 - protocol: HTTP - persistence: - config: - storageClass: ceph-block - accessMode: ReadWriteOnce - size: 5Gi - retain: true - advancedMounts: - main: - main: - - path: /config - readOnly: false - books: - existingClaim: calibre-web-nfs-storage - advancedMounts: - main: - main: - - path: /books - readOnly: true diff --git a/clusters/cl01tl/applications/homepage/values.yaml b/clusters/cl01tl/applications/homepage/values.yaml index c66a42368..9e232ccf2 100644 --- a/clusters/cl01tl/applications/homepage/values.yaml +++ b/clusters/cl01tl/applications/homepage/values.yaml @@ -161,9 +161,9 @@ homepage: statusStyle: dot - Books: icon: calibre-web.png - description: Calibre + description: Calibre Web Automated href: https://calibre.alexlebens.net - siteMonitor: http://calibre-web.calibre-web:80 + siteMonitor: http://calibre-web-automated.calibre-web-automated:80 statusStyle: dot - External: - Passwords: