From 286e8c61982800ce1bed6e0a3905717c13fc2318 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Tue, 13 Sep 2022 02:26:09 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20remove=20bookstack=20&=20mariadb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cluster/apps/data/bookstack/export-job.yaml | 66 ----------------- cluster/apps/data/bookstack/helm-release.yaml | 70 ------------------- .../apps/data/bookstack/kustomization.yaml | 7 -- cluster/apps/data/bookstack/secrets.sops.yaml | 27 ------- cluster/apps/data/bookstack/volume.yaml | 15 ---- cluster/apps/data/kustomization.yaml | 2 - cluster/apps/data/mariadb/helm-release.yaml | 28 -------- cluster/apps/data/mariadb/kustomization.yaml | 5 -- cluster/apps/data/mariadb/volume.yaml | 15 ---- 9 files changed, 235 deletions(-) delete mode 100644 cluster/apps/data/bookstack/export-job.yaml delete mode 100644 cluster/apps/data/bookstack/helm-release.yaml delete mode 100644 cluster/apps/data/bookstack/kustomization.yaml delete mode 100644 cluster/apps/data/bookstack/secrets.sops.yaml delete mode 100644 cluster/apps/data/bookstack/volume.yaml delete mode 100644 cluster/apps/data/mariadb/helm-release.yaml delete mode 100644 cluster/apps/data/mariadb/kustomization.yaml delete mode 100644 cluster/apps/data/mariadb/volume.yaml diff --git a/cluster/apps/data/bookstack/export-job.yaml b/cluster/apps/data/bookstack/export-job.yaml deleted file mode 100644 index f4d0046ad..000000000 --- a/cluster/apps/data/bookstack/export-job.yaml +++ /dev/null @@ -1,66 +0,0 @@ ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - name: bookstack-books-export - namespace: data -spec: - schedule: "@daily" - jobTemplate: - spec: - template: - metadata: - name: bookstack-books-export - spec: - serviceAccountName: jobs - imagePullSecrets: - - name: regcred - containers: - - name: gitea-repositories-backup - image: ghcr.io/auricom/kubectl:v1.25.0@sha256:ee2a4883c68adf439fe76a8102261a29cdff34c427822a08bafe264d8dbd09be - imagePullPolicy: IfNotPresent - command: - - "bin/sh" - - "-ec" - - | - #!/bin/bash - - set -o nounset - set -o errexit - - mkdir -p ~/.ssh - cp /opt/id_rsa ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - ssh -o StrictHostKeyChecking=no homelab@${LOCAL_LAN_TRUENAS} << 'EOF' - - set -x - - WORK_DIR="/mnt/storage/backups/apps/bookstack" - - SHELVES=$(curl --silent --location --request GET "https://bookstack.${SECRET_CLUSTER_DOMAIN}/api/shelves" --header "Authorization: Token ${SECRET_BOOKSTACK_TOKEN_ID}:${SECRET_BOOKSTACK_TOKEN_SECRET}" | jq --raw-output .data[].id) - - for shelf in $SHELVES - do - shelf_slug=$(curl --silent --location --request GET "https://bookstack.${SECRET_CLUSTER_DOMAIN}/api/shelves/$shelf" --header "Authorization: Token ${SECRET_BOOKSTACK_TOKEN_ID}:${SECRET_BOOKSTACK_TOKEN_SECRET}" | jq --raw-output .slug) - mkdir -p $WORK_DIR/$shelf_slug - BOOKS=$(curl --silent --location --request GET "https://bookstack.${SECRET_CLUSTER_DOMAIN}/api/shelves/$shelf" --header "Authorization: Token ${SECRET_BOOKSTACK_TOKEN_ID}:${SECRET_BOOKSTACK_TOKEN_SECRET}" | jq --raw-output .books[].id) - for book in $BOOKS - do - book_slug=$(curl --silent --location --request GET "https://bookstack.${SECRET_CLUSTER_DOMAIN}/api/books/$book" --header "Authorization: Token ${SECRET_BOOKSTACK_TOKEN_ID}:${SECRET_BOOKSTACK_TOKEN_SECRET}" | jq --raw-output .slug) - echo "INFO: export book $book_slug..." - curl --silent --location --request GET "https://bookstack.${SECRET_CLUSTER_DOMAIN}/api/books/$book/export/html" --header "Authorization: Token ${SECRET_BOOKSTACK_TOKEN_ID}:${SECRET_BOOKSTACK_TOKEN_SECRET}" --output $WORK_DIR/$shelf_slug/$book_slug.html - done - done - EOF - - curl -m 10 --retry 5 http://healthchecks.monitoring.svc.cluster.local:8000/ping/63ddc7f3-87c4-405d-8fab-b666b9d6c67e - volumeMounts: - - name: secret - mountPath: /opt/id_rsa - subPath: deployment_rsa_priv_key - volumes: - - name: secret - secret: - secretName: bookstack-secrets - restartPolicy: Never diff --git a/cluster/apps/data/bookstack/helm-release.yaml b/cluster/apps/data/bookstack/helm-release.yaml deleted file mode 100644 index 5f405d5b4..000000000 --- a/cluster/apps/data/bookstack/helm-release.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: &app bookstack - namespace: data -spec: - interval: 15m - chart: - spec: - chart: kah-common-chart - version: 1.2.2 - sourceRef: - kind: HelmRepository - name: k8s-at-home-charts - namespace: flux-system - interval: 15m - install: - createNamespace: true - remediation: - retries: 5 - upgrade: - remediation: - retries: 5 - values: - global: - nameOverride: *app - - image: - repository: ghcr.io/linuxserver/bookstack - tag: version-v22.07.3 - - service: - main: - ports: - http: - port: 80 - - env: - APP_URL: https://bookstack.${SECRET_CLUSTER_DOMAIN}/ - DB_HOST: mariadb.data.svc.cluster.local. - DB_DATABASE: bookstack - DB_USERNAME: bookstack - DB_PASSWORD: ${SECRET_BOOKSTACK_DB_PASSWORD} - - persistence: - config: - enabled: true - existingClaim: bookstack-config - mountPath: /config - - ingress: - main: - enabled: true - ingressClassName: "nginx" - hosts: - - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" - paths: - - path: / - pathType: Prefix - tls: - - hosts: - - *host - - resources: - requests: - cpu: 100m - memory: 256Mi - limits: - memory: 1Gi diff --git a/cluster/apps/data/bookstack/kustomization.yaml b/cluster/apps/data/bookstack/kustomization.yaml deleted file mode 100644 index a586c08f0..000000000 --- a/cluster/apps/data/bookstack/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - secrets.sops.yaml - - volume.yaml - - export-job.yaml - - helm-release.yaml diff --git a/cluster/apps/data/bookstack/secrets.sops.yaml b/cluster/apps/data/bookstack/secrets.sops.yaml deleted file mode 100644 index 51db66b63..000000000 --- a/cluster/apps/data/bookstack/secrets.sops.yaml +++ /dev/null @@ -1,27 +0,0 @@ -kind: Secret -apiVersion: v1 -metadata: - name: bookstack-secrets - namespace: data -stringData: - deployment_rsa_priv_key: ENC[AES256_GCM,data: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,iv:vMdKKCnWBgTDiqvJdXAN9QJeoBEMucPFQlF634QLV9M=,tag:iJ3dUexqwiEfT/mboY7HZA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1hhurqwmfvl9m3vh3hk8urulfzcdsrep2ax2neazqt435yhpamu3qj20asg - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtQUJSSUc3K1hxZ1d1Q3dI - SENqMUlaVkJEN3RkMXpsTnUyN05hN0ZuZ0d3CkYvVVdkNDF1WkRMREM1U3FtNzZk - NGxtM25oaUMzeEYwNFA4TW4xTG1ENVEKLS0tIG1vY3JQRUplR1VBUzQ5VTR0L3Ro - cG5JYXp0cllxTXVnY1ZOL1RlNWRaK2sK76zdi1HuLcoHEc0JTVLsenoa7JQv0DGz - y/yDIArOoocUryeb62DuSKQNZmcZLhHbJUWvFIkacDi82CcxuvdDLw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-07-03T14:41:17Z" - mac: ENC[AES256_GCM,data:kIa5+mV0ZY9XR/6zb5INz8bUaPCMHSaE0s7R697ogrnYufx971Nr8TVA7X4dgNpvYC6HUgdRbUxWr/TbtJCq+z1hkXdIiFZKJBBy7gcgJRXCleduMi4IikrkW7fAcQZmeHqvd+MNUXBiebGWCpGe0PCij5xnjq/K4pJ4qJX1OdY=,iv:PfuJ+VSxKzhJGGwN+WQ9KGwF2aJITKT4CAmPCP/8DCg=,tag:JCk32OUKBIweJoO9FpwFGA==,type:str] - pgp: [] - encrypted_regex: ^(data|stringData)$ - version: 3.7.3 diff --git a/cluster/apps/data/bookstack/volume.yaml b/cluster/apps/data/bookstack/volume.yaml deleted file mode 100644 index a342a6d7d..000000000 --- a/cluster/apps/data/bookstack/volume.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: bookstack-config - namespace: data - labels: - kasten-io/backup: "true" -spec: - accessModes: - - ReadWriteOnce - storageClassName: rook-ceph-block - resources: - requests: - storage: 5Gi diff --git a/cluster/apps/data/kustomization.yaml b/cluster/apps/data/kustomization.yaml index 7d78dd6c7..290e5e4a2 100644 --- a/cluster/apps/data/kustomization.yaml +++ b/cluster/apps/data/kustomization.yaml @@ -3,12 +3,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - namespace.yaml - - bookstack - freshrss - homer - jobs - joplin - - mariadb - pgadmin - pgbackups - resilio-sync diff --git a/cluster/apps/data/mariadb/helm-release.yaml b/cluster/apps/data/mariadb/helm-release.yaml deleted file mode 100644 index b346af9d4..000000000 --- a/cluster/apps/data/mariadb/helm-release.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: mariadb - namespace: data -spec: - interval: 5m - chart: - spec: - # renovate: registryUrl=https://charts.bitnami.com/bitnami - chart: mariadb - version: 11.3.0 - sourceRef: - kind: HelmRepository - name: bitnami-charts - namespace: flux-system - interval: 5m - values: - auth: - rootPassword: "${SECRET_MARIADB_ROOT_PASSWORD}" - database: bookstack - username: bookstack - password: "${SECRET_BOOKSTACK_DB_PASSWORD}" - primary: - persistence: - enabled: true - existingClaim: mariadb diff --git a/cluster/apps/data/mariadb/kustomization.yaml b/cluster/apps/data/mariadb/kustomization.yaml deleted file mode 100644 index 21f1d9e05..000000000 --- a/cluster/apps/data/mariadb/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - helm-release.yaml - - volume.yaml diff --git a/cluster/apps/data/mariadb/volume.yaml b/cluster/apps/data/mariadb/volume.yaml deleted file mode 100644 index 1b511a21d..000000000 --- a/cluster/apps/data/mariadb/volume.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: mariadb - namespace: data - labels: - kasten-io/backup: "true" -spec: - accessModes: - - ReadWriteOnce - storageClassName: rook-ceph-block - resources: - requests: - storage: 25Gi