From 8c5152541061ece62b6bb44594989243caed17a3 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 12 Jul 2025 22:54:51 +1000 Subject: [PATCH] Replace operator with deployment --- deployments/home-server/vaultwarden.yaml | 24 ----- deployments/operators/postgresql.yaml | 116 +++++++++++++---------- 2 files changed, 65 insertions(+), 75 deletions(-) diff --git a/deployments/home-server/vaultwarden.yaml b/deployments/home-server/vaultwarden.yaml index 754cb62..befe1fa 100644 --- a/deployments/home-server/vaultwarden.yaml +++ b/deployments/home-server/vaultwarden.yaml @@ -177,27 +177,3 @@ spec: - name: vaultwarden-data persistentVolumeClaim: claimName: vaultwarden-pvc ---- -apiVersion: acid.zalan.do/v1 -kind: postgresql -metadata: - name: vwdb - namespace: home-server -spec: - teamId: "acid" - volume: - size: 2Gi - numberOfInstances: 1 - users: - vaultwarden_user: - - login - databases: - vaultwarden: vaultwarden_user - postgresql: - version: "15" - usersFromSecret: - vaultwarden_user: - secretName: vaultwarden-db-credentials - secretKeyUsername: username - secretKeyPassword: password - diff --git a/deployments/operators/postgresql.yaml b/deployments/operators/postgresql.yaml index d73afdc..fbe30a7 100644 --- a/deployments/operators/postgresql.yaml +++ b/deployments/operators/postgresql.yaml @@ -1,68 +1,82 @@ + --- apiVersion: v1 kind: Namespace metadata: - name: zalando-postgres-operator + name: postgres --- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository +apiVersion: v1 +kind: PersistentVolume metadata: - name: postgres-operator-charts - namespace: flux-system + name: postgres-pv + namespace: postgres spec: - interval: 1h - url: https://opensource.zalando.com/postgres-operator/charts/postgres-operator + capacity: + storage: 5Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + storageClassName: local-path + hostPath: + path: /dpool/services/postgres/data --- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease +apiVersion: v1 +kind: PersistentVolumeClaim metadata: - name: postgres-operator - namespace: zalando-postgres-operator + name: postgres-pvc + namespace: postgres spec: - interval: 30m - chart: + accessModes: + - ReadWriteOnce + storageClassName: local-path + resources: + requests: + storage: 5Gi + volumeName: postgres-pv + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: postgres + namespace: postgres +spec: + replicas: 1 + selector: + matchLabels: + app: postgres + template: + metadata: + labels: + app: postgres spec: - chart: postgres-operator - version: 1.10.1 # Optional: adjust if newer versions become available - sourceRef: - kind: HelmRepository - name: postgres-operator-charts - namespace: flux-system - install: - createNamespace: true - values: - configGeneral: - enable_crd_registration: true - watched_namespaces: "*" + containers: + - name: postgres + image: postgres:15 + ports: + - containerPort: 5432 + envFrom: + - secretRef: + name: postgres-secret + volumeMounts: + - name: postgres-data + mountPath: /var/lib/postgresql/data + volumes: + - name: postgres-data + persistentVolumeClaim: + claimName: postgres-pvc --- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository +apiVersion: v1 +kind: Service metadata: - name: postgres-operator-ui-charts - namespace: flux-system + name: postgres + namespace: postgres spec: - interval: 1h - url: https://opensource.zalando.com/postgres-operator/charts/postgres-operator-ui - ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: postgres-operator-ui - namespace: zalando-postgres-operator -spec: - interval: 30m - chart: - spec: - chart: postgres-operator-ui - version: 1.10.1 # Optional: update based on available version - sourceRef: - kind: HelmRepository - name: postgres-operator-ui-charts - namespace: flux-system - install: - createNamespace: true - + selector: + app: postgres + ports: + - port: 5432 + targetPort: 5432