diff --git a/clusters/atlas/flux-system/applications/kustomization.yaml b/clusters/atlas/flux-system/applications/kustomization.yaml index cc98f6b..d48cf9e 100644 --- a/clusters/atlas/flux-system/applications/kustomization.yaml +++ b/clusters/atlas/flux-system/applications/kustomization.yaml @@ -25,6 +25,5 @@ resources: - ai-llm/kustomization.yaml - nextcloud/kustomization.yaml - nextcloud-mail-sync/kustomization.yaml - - minio/kustomization.yaml - outline/kustomization.yaml - planka/kustomization.yaml diff --git a/clusters/atlas/flux-system/applications/minio/kustomization.yaml b/clusters/atlas/flux-system/applications/minio/kustomization.yaml deleted file mode 100644 index e776a3e..0000000 --- a/clusters/atlas/flux-system/applications/minio/kustomization.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# clusters/atlas/flux-system/applications/minio/kustomization.yaml -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: minio - namespace: flux-system -spec: - interval: 10m - path: ./services/minio - prune: true - sourceRef: - kind: GitRepository - name: flux-system - targetNamespace: minio - healthChecks: - - apiVersion: apps/v1 - kind: Deployment - name: minio - namespace: minio - - apiVersion: v1 - kind: Service - name: minio - namespace: minio - wait: false diff --git a/clusters/atlas/flux-system/applications/outline/kustomization.yaml b/clusters/atlas/flux-system/applications/outline/kustomization.yaml index e01449b..429d093 100644 --- a/clusters/atlas/flux-system/applications/outline/kustomization.yaml +++ b/clusters/atlas/flux-system/applications/outline/kustomization.yaml @@ -15,7 +15,6 @@ spec: dependsOn: - name: keycloak - name: mailu - - name: minio - name: traefik healthChecks: - apiVersion: apps/v1 diff --git a/services/minio/bucket-job.yaml b/services/minio/bucket-job.yaml deleted file mode 100644 index 3e9fa15..0000000 --- a/services/minio/bucket-job.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# services/minio/bucket-job.yaml -apiVersion: batch/v1 -kind: Job -metadata: - name: minio-bucket-bootstrap-2 - namespace: minio -spec: - backoffLimit: 1 - ttlSecondsAfterFinished: 3600 - template: - spec: - restartPolicy: Never - nodeSelector: - node-role.kubernetes.io/worker: "true" - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: hardware - operator: In - values: ["rpi4", "rpi5"] - containers: - - name: mc - image: minio/mc:RELEASE.2025-08-13T08-35-41Z - command: ["/bin/sh", "-c"] - args: - - | - set -euo pipefail - mc alias set local http://minio.minio.svc.cluster.local:9000 "${MINIO_ROOT_USER}" "${MINIO_ROOT_PASSWORD}" - mc mb -p local/outline || true - mc mb -p local/planka || true - env: - - name: MINIO_ROOT_USER - valueFrom: - secretKeyRef: - name: minio-credentials - key: rootUser - - name: MINIO_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: minio-credentials - key: rootPassword - resources: - requests: - cpu: 50m - memory: 64Mi - limits: - cpu: 200m - memory: 128Mi diff --git a/services/minio/deployment.yaml b/services/minio/deployment.yaml deleted file mode 100644 index 4b6d72a..0000000 --- a/services/minio/deployment.yaml +++ /dev/null @@ -1,68 +0,0 @@ -# services/minio/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: minio - namespace: minio - labels: - app: minio -spec: - replicas: 1 - selector: - matchLabels: - app: minio - strategy: - type: Recreate - template: - metadata: - labels: - app: minio - spec: - nodeSelector: - node-role.kubernetes.io/worker: "true" - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: hardware - operator: In - values: ["rpi4", "rpi5"] - containers: - - name: minio - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - args: - - server - - /data - - --console-address - - ":9001" - env: - - name: MINIO_ROOT_USER - valueFrom: - secretKeyRef: - name: minio-credentials - key: rootUser - - name: MINIO_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: minio-credentials - key: rootPassword - ports: - - name: api - containerPort: 9000 - - name: console - containerPort: 9001 - volumeMounts: - - name: data - mountPath: /data - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: "1" - memory: 2Gi - volumes: - - name: data - persistentVolumeClaim: - claimName: minio-data diff --git a/services/minio/kustomization.yaml b/services/minio/kustomization.yaml deleted file mode 100644 index 0565e31..0000000 --- a/services/minio/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# services/minio/kustomization.yaml -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: minio -resources: - - namespace.yaml - - pvc.yaml - - deployment.yaml - - bucket-job.yaml - - service.yaml diff --git a/services/minio/namespace.yaml b/services/minio/namespace.yaml deleted file mode 100644 index 3465488..0000000 --- a/services/minio/namespace.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# services/minio/namespace.yaml -apiVersion: v1 -kind: Namespace -metadata: - name: minio diff --git a/services/minio/pvc.yaml b/services/minio/pvc.yaml deleted file mode 100644 index 5c3828b..0000000 --- a/services/minio/pvc.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# services/minio/pvc.yaml -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: minio-data - namespace: minio -spec: - accessModes: ["ReadWriteOnce"] - storageClassName: asteria - resources: - requests: - storage: 100Gi diff --git a/services/minio/service.yaml b/services/minio/service.yaml deleted file mode 100644 index d2edec5..0000000 --- a/services/minio/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# services/minio/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: minio - namespace: minio - labels: - app: minio -spec: - selector: - app: minio - ports: - - name: api - port: 9000 - targetPort: api - - name: console - port: 9001 - targetPort: console diff --git a/services/outline/deployment.yaml b/services/outline/deployment.yaml index dd50800..9f8160e 100644 --- a/services/outline/deployment.yaml +++ b/services/outline/deployment.yaml @@ -49,13 +49,9 @@ spec: - name: PGSSLMODE value: disable - name: FILE_STORAGE - value: s3 - - name: AWS_REGION - value: us-east-1 - - name: AWS_S3_FORCE_PATH_STYLE - value: "true" - - name: AWS_S3_ACL - value: private + value: local + - name: FILE_STORAGE_LOCAL_ROOT_DIR + value: /var/lib/outline/data - name: FORCE_HTTPS value: "true" - name: OIDC_ENFORCED @@ -77,13 +73,11 @@ spec: name: outline-secrets - secretRef: name: outline-oidc - - secretRef: - name: outline-s3 - secretRef: name: outline-smtp volumeMounts: - - name: app-data - mountPath: /var/lib/outline + - name: user-data + mountPath: /var/lib/outline/data readinessProbe: httpGet: path: /_health @@ -108,6 +102,6 @@ spec: cpu: "1" memory: 2Gi volumes: - - name: app-data + - name: user-data persistentVolumeClaim: - claimName: outline-app + claimName: outline-user-data diff --git a/services/outline/kustomization.yaml b/services/outline/kustomization.yaml index 941cb91..33640f6 100644 --- a/services/outline/kustomization.yaml +++ b/services/outline/kustomization.yaml @@ -4,7 +4,7 @@ kind: Kustomization namespace: outline resources: - namespace.yaml - - app-pvc.yaml + - user-pvc.yaml - redis-deployment.yaml - redis-service.yaml - deployment.yaml diff --git a/services/outline/app-pvc.yaml b/services/outline/user-pvc.yaml similarity index 64% rename from services/outline/app-pvc.yaml rename to services/outline/user-pvc.yaml index 8ac702c..f31426d 100644 --- a/services/outline/app-pvc.yaml +++ b/services/outline/user-pvc.yaml @@ -1,12 +1,12 @@ -# services/outline/app-pvc.yaml +# services/outline/user-pvc.yaml apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: outline-app + name: outline-user-data namespace: outline spec: accessModes: ["ReadWriteOnce"] - storageClassName: astreae + storageClassName: asteria resources: requests: storage: 5Gi