From cac47c1db7be65bac7c84327f928fb37bdf49ed7 Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <svashisht@redhat.com>
Date: Tue, 9 Apr 2024 16:28:51 +0200
Subject: [PATCH] openscanhub: remove `openscanhub` prefix from

... `/var/lib/osh` pvc used by `osh-hub`.

Signed-off-by: Siteshwar Vashisht <svashisht@redhat.com>
---
 playbooks/openshift-apps/openscanhub.yml                    | 4 ++--
 .../openscanhub/files/deployment-fedora-osh-hub.yml         | 6 +++---
 ...{openscanhub-pvc-var-lib-osh.yml => pvc-var-lib-osh.yml} | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename roles/openshift-apps/openscanhub/templates/{openscanhub-pvc-var-lib-osh.yml => pvc-var-lib-osh.yml} (91%)

diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml
index 545505ed74..fd297c5add 100644
--- a/playbooks/openshift-apps/openscanhub.yml
+++ b/playbooks/openshift-apps/openscanhub.yml
@@ -39,8 +39,8 @@
     when: env == "staging"
   - role: openshift/object
     app: openscanhub
-    template: openscanhub-pvc-var-lib-osh.yml
-    objectname: openscanhub-pvc-var-lib-osh
+    template: pvc-var-lib-osh.yml
+    objectname: pvc-var-lib-osh
   - role: openshift/object
     app: openscanhub
     template: settings-local-configmap.yml
diff --git a/roles/openshift-apps/openscanhub/files/deployment-fedora-osh-hub.yml b/roles/openshift-apps/openscanhub/files/deployment-fedora-osh-hub.yml
index fe955d3457..40c949adda 100644
--- a/roles/openshift-apps/openscanhub/files/deployment-fedora-osh-hub.yml
+++ b/roles/openshift-apps/openscanhub/files/deployment-fedora-osh-hub.yml
@@ -24,7 +24,7 @@ spec:
         name: fedora-osh-hub
         volumeMounts:
           - mountPath: /var/lib/osh/
-            name: openscanhub-pvc-var-lib-osh
+            name: pvc-var-lib-osh
           - mountPath: /etc/keytabs
             name: openscanhub-keytab
           - mountPath: /usr/lib/python3.9/site-packages/osh/hub/settings_local.py
@@ -48,9 +48,9 @@ spec:
           failureThreshold: 3
       restartPolicy: Always
       volumes:
-        - name: openscanhub-pvc-var-lib-osh
+        - name: pvc-var-lib-osh
           persistentVolumeClaim:
-            claimName: openscanhub-pvc-var-lib-osh
+            claimName: pvc-var-lib-osh
         - name: openscanhub-keytab
           secret:
             defaultMode: 420
diff --git a/roles/openshift-apps/openscanhub/templates/openscanhub-pvc-var-lib-osh.yml b/roles/openshift-apps/openscanhub/templates/pvc-var-lib-osh.yml
similarity index 91%
rename from roles/openshift-apps/openscanhub/templates/openscanhub-pvc-var-lib-osh.yml
rename to roles/openshift-apps/openscanhub/templates/pvc-var-lib-osh.yml
index 2434f4fb34..ec46d7401c 100644
--- a/roles/openshift-apps/openscanhub/templates/openscanhub-pvc-var-lib-osh.yml
+++ b/roles/openshift-apps/openscanhub/templates/pvc-var-lib-osh.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: openscanhub-pvc-var-lib-osh
+  name: pvc-var-lib-osh
 spec:
   # This volume is on NFS.
   volumeName: fedora-openscanhub-var-lib-osh-{{env_short}}