From 5e234c8d326542e15537734c165094e0a8102a79 Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Thu, 13 Apr 2023 18:20:32 +0100
Subject: [PATCH] Finish synapse PV upgrade

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 manifests/matrix_chart/matrix_chart.yaml | 20 +-----------
 manifests/matrix_chart/pvs.yaml          | 40 ------------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/manifests/matrix_chart/matrix_chart.yaml b/manifests/matrix_chart/matrix_chart.yaml
index 2d275e7..407d192 100644
--- a/manifests/matrix_chart/matrix_chart.yaml
+++ b/manifests/matrix_chart/matrix_chart.yaml
@@ -457,21 +457,6 @@ spec:
             - name: signing-key
               mountPath: /data/keys
       containers:
-        - name: copy-media
-          image: "bash"
-          imagePullPolicy: IfNotPresent
-          command:
-          - bash
-          - -c
-          - |
-            cp -R /data/old /data/new
-            echo "Done"
-            sleep 9999
-          volumeMounts:
-            - name: media-store
-              mountPath: /data/old
-            - name: user-media
-              mountPath: /data/new
         - name: "synapse"
           image: "matrixdotorg/synapse:v1.71.0"
           imagePullPolicy: IfNotPresent
@@ -500,7 +485,7 @@ spec:
               subPath: matrix.cluster.fun.log.config
             - name: signing-key
               mountPath: /data/keys
-            - name: media-store
+            - name: user-media
               mountPath: /data/media_store
             - name: uploads
               mountPath: /data/uploads
@@ -550,9 +535,6 @@ spec:
         - name: signing-key
           persistentVolumeClaim:
             claimName: chat-matrix-signing-key
-        - name: media-store
-          persistentVolumeClaim:
-            claimName: chat-matrix-media-store
         - name: user-media
           persistentVolumeClaim:
             claimName: chat-matrix-user-media
diff --git a/manifests/matrix_chart/pvs.yaml b/manifests/matrix_chart/pvs.yaml
index b92752a..ec8095e 100644
--- a/manifests/matrix_chart/pvs.yaml
+++ b/manifests/matrix_chart/pvs.yaml
@@ -1,45 +1,5 @@
 apiVersion: v1
 kind: PersistentVolume
-metadata:
-  annotations:
-    pv.kubernetes.io/provisioned-by: csi.scaleway.com
-  finalizers:
-  - kubernetes.io/pv-protection
-  - external-attacher/csi-scaleway-com
-  name: pvc-fb3ef708-13ad-4f9b-b6b7-5e6cbb9c1bdf
-spec:
-  accessModes:
-  - ReadWriteOnce
-  capacity:
-    storage: 8Gi
-  csi:
-    driver: csi.scaleway.com
-    fsType: ext4
-    volumeAttributes:
-      storage.kubernetes.io/csiProvisionerIdentity: 1588413765965-1847-csi.scaleway.com
-    volumeHandle: fr-par-1/eb8e5669-56ea-49e3-a631-efbeaca4c4ef
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: scw-bssd
-  volumeMode: Filesystem
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: chat-matrix-media-store
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: synapse
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 8Gi
-  volumeName: pvc-fb3ef708-13ad-4f9b-b6b7-5e6cbb9c1bdf
----
-apiVersion: v1
-kind: PersistentVolume
 metadata:
   annotations:
     pv.kubernetes.io/provisioned-by: csi.scaleway.com