From 0e08a46926512af29b99dc105c0c5c7cb866e140 Mon Sep 17 00:00:00 2001 From: AB Date: Sat, 11 Jul 2026 14:40:05 +0300 Subject: [PATCH] Moved to PSQL --- k8s/apps/web-petting/deployment.yaml | 12 +++++----- k8s/apps/web-petting/external-secrets.yaml | 26 ++++++++++++++++++++++ k8s/apps/web-petting/kustomization.yaml | 2 +- k8s/apps/web-petting/storage.yaml | 12 ---------- 4 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 k8s/apps/web-petting/external-secrets.yaml delete mode 100644 k8s/apps/web-petting/storage.yaml diff --git a/k8s/apps/web-petting/deployment.yaml b/k8s/apps/web-petting/deployment.yaml index 90d0b2c..e2d03ad 100644 --- a/k8s/apps/web-petting/deployment.yaml +++ b/k8s/apps/web-petting/deployment.yaml @@ -19,10 +19,6 @@ spec: nodeSelector: kubernetes.io/os: linux kubernetes.io/hostname: master.tail2fe2d.ts.net - volumes: - - name: data - persistentVolumeClaim: - claimName: web-petting-data containers: - name: web-petting image: ultradesu/web-petting:latest @@ -37,14 +33,16 @@ spec: ports: - containerPort: 3000 name: http - volumeMounts: - - name: data - mountPath: /data env: - name: RUST_LOG value: "info" - name: WEB_PETTING_DEBUG value: "false" + - name: WEB_PETTING_DATABASE_URL + valueFrom: + secretKeyRef: + name: web-petting-secrets + key: WEB_PETTING_DATABASE_URL resources: requests: memory: "256Mi" diff --git a/k8s/apps/web-petting/external-secrets.yaml b/k8s/apps/web-petting/external-secrets.yaml new file mode 100644 index 0000000..6e0ccf3 --- /dev/null +++ b/k8s/apps/web-petting/external-secrets.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: web-petting-secrets +spec: + target: + name: web-petting-secrets + deletionPolicy: Delete + template: + type: Opaque + data: + WEB_PETTING_DATABASE_URL: |- + postgresql://web_petting:{{ .web_petting }}@psql.psql.svc:5432/web_petting + data: + - secretKey: web_petting + sourceRef: + storeRef: + name: vaultwarden-login + kind: ClusterSecretStore + remoteRef: + conversionStrategy: Default + decodingStrategy: None + metadataPolicy: None + key: 2a9deb39-ef22-433e-a1be-df1555625e22 + property: fields[20].value diff --git a/k8s/apps/web-petting/kustomization.yaml b/k8s/apps/web-petting/kustomization.yaml index 5dca463..2ed1293 100644 --- a/k8s/apps/web-petting/kustomization.yaml +++ b/k8s/apps/web-petting/kustomization.yaml @@ -4,7 +4,7 @@ kind: Kustomization resources: - app.yaml - deployment.yaml + - external-secrets.yaml - service.yaml - ingress.yaml - - storage.yaml diff --git a/k8s/apps/web-petting/storage.yaml b/k8s/apps/web-petting/storage.yaml deleted file mode 100644 index 987d34a..0000000 --- a/k8s/apps/web-petting/storage.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: web-petting-data -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn - resources: - requests: - storage: 10Gi