diff --git a/manifests/gitea/chart.yaml b/manifests/gitea/chart.yaml index 06bfeab..a3f4b17 100644 --- a/manifests/gitea/chart.yaml +++ b/manifests/gitea/chart.yaml @@ -15,7 +15,7 @@ spec: chart: spec: chart: gitea - version: "12.6.0" + version: "12.7.0" sourceRef: kind: HelmRepository name: gitea-repository @@ -35,7 +35,7 @@ spec: storageClass: longhorn-default image: - tag: "1.26.2" + tag: "1.27.1" replicaCount: 1 @@ -85,15 +85,15 @@ spec: DISABLE_REGISTRATION: "true" storage: STORAGE_TYPE: minio - MINIO_ENDPOINT: "nas1.shire-zebra.ts.net:9000" + MINIO_ENDPOINT: "nas1.shire-zebra.ts.net:30188" MINIO_BUCKET: gitea - MINIO_LOCATION: us-east-1 + MINIO_LOCATION: garage # MINIO_ACCESS_KEY_ID: "" # MINIO_SECRET_ACCESS_KEY: "" MINIO_USE_SSL: "false" MINIO_INSECURE_SKIP_VERIFY: "true" - webhook: - ALLOWED_HOST_LIST: loopback,private,*.shire-zebra.ts.net + security: + ALLOWED_HOST_LIST: loopback,private,*.shire-zebra.ts.net,*.nebula.thehellings.com metrics: enabled: false @@ -102,8 +102,8 @@ spec: persistence: enabled: true - storageClass: longhorn-default - size: "50Gi" + create: false + claimName: gitea-new # I will manage my Postgres externally postgresql: diff --git a/manifests/gitea/dump-cronjob.yaml b/manifests/gitea/dump-cronjob.yaml index 51e75e7..0912c6a 100644 --- a/manifests/gitea/dump-cronjob.yaml +++ b/manifests/gitea/dump-cronjob.yaml @@ -18,12 +18,12 @@ spec: volumes: - name: gitea-data persistentVolumeClaim: - claimName: gitea-shared-storage + claimName: gitea-new - name: dump-staging emptyDir: {} initContainers: - name: gitea-dump - image: "gitea/gitea:1.25.4" + image: "gitea/gitea:1.27.1" command: - /bin/sh - "-c" @@ -51,12 +51,12 @@ spec: - | set -e # Configure mc alias for MinIO - mc alias set nas1 http://nas1.shire-zebra.ts.net:9000 \ + mc alias set nas1 http://nas1.shire-zebra.ts.net:30188 \ "${MINIO_ACCESS_KEY}" "${MINIO_SECRET_KEY}" # Upload dump to backup-gitea bucket DUMP_FILE=$(ls /dump-staging/gitea-dump-*.zip | head -1) - mc cp "${DUMP_FILE}" "nas1/backup-gitea/$(basename ${DUMP_FILE})" - echo "Uploaded $(basename ${DUMP_FILE}) to backup-gitea" + mc cp "${DUMP_FILE}" "nas1/gitea-backup/$(basename ${DUMP_FILE})" + echo "Uploaded $(basename ${DUMP_FILE}) to gitea-backup" # Set 30-day lifecycle on the bucket (idempotent) mc ilm rule add --expire-days 30 nas1/backup-gitea 2>/dev/null || true volumeMounts: @@ -69,10 +69,10 @@ spec: - name: MINIO_ACCESS_KEY valueFrom: secretKeyRef: - name: gitea-config + name: gitea-backup key: minio_key - name: MINIO_SECRET_KEY valueFrom: secretKeyRef: - name: gitea-config + name: gitea-backup key: minio_secret diff --git a/manifests/gitea/secrets.yaml b/manifests/gitea/secrets.yaml index f0117bd..cbc05e2 100644 --- a/manifests/gitea/secrets.yaml +++ b/manifests/gitea/secrets.yaml @@ -1,5 +1,32 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret +metadata: + name: gitea-backup +spec: + target: + name: gitea-backup + deletionPolicy: Delete + template: + type: Opaque + data: + minio_key: "{{ .minio_key }}" + minio_secret: "{{ .minio_secret }}" + secretStoreRef: + name: bitwarden-login + kind: ClusterSecretStore + data: + # MinIO credentials + - secretKey: minio_key + remoteRef: + key: dfb2f0c8-110d-4e96-83a7-b49c001c0897 + property: username + - secretKey: minio_secret + remoteRef: + key: dfb2f0c8-110d-4e96-83a7-b49c001c0897 + property: password +--- +apiVersion: external-secrets.io/v1 +kind: ExternalSecret metadata: name: gitea-config spec: @@ -21,23 +48,14 @@ spec: name: bitwarden-login kind: ClusterSecretStore data: - # MinIO credentials - - secretKey: minio_key - remoteRef: - key: dcbcf704-7dce-48d7-bbd1-b3a801875b3d - property: username - - secretKey: minio_secret - remoteRef: - key: dcbcf704-7dce-48d7-bbd1-b3a801875b3d - property: password # MinIO credentials for NAS1 - secretKey: minio_nas1_key remoteRef: - key: c4c66ab3-2ade-4086-9c0d-b3a80172b1ba + key: 33e8e4e0-eb90-484c-9ec9-b3a8018077a3 property: username - secretKey: minio_nas1_secret remoteRef: - key: c4c66ab3-2ade-4086-9c0d-b3a80172b1ba + key: 33e8e4e0-eb90-484c-9ec9-b3a8018077a3 property: password # Postgres credentials - secretKey: dbuser