Fix bugs in the restore task templates

chart/cluster-tasks/templates/drupalsite-restore.yaml

@@ -32,17 +32,17 @@ spec:
         export OPERATIONS_IMAGE={{ .Values.image }}
         export RESTORE_SERVICE_ACCOUNT={{ .Values.restoreServiceAccount }}
         envsubst < /tekton-task-templates/restore_pv_job.yaml | oc create -f -
-        oc wait --for=condition=complete job/$TASK-$(params.drupalSite) -n openshift-cern-cephfs
-        jobStatus=$(oc get job/$TASK-$(params.drupalSite) -n openshift-cern-cephfs -o=jsonpath='{.status.conditions[*].type}' | grep -i -E 'failed|complete' || echo "Failed")
+        oc wait --for=condition=complete job/$TASK-$(params.drupalSite) -n $VELERO_NAMESPACE
+        jobStatus=$(oc get job/$TASK-$(params.drupalSite) -n $VELERO_NAMESPACE -o=jsonpath='{.status.conditions[*].type}' | grep -i -E 'failed|complete' || echo "Failed")
         echo "Files restore Job status: $jobStatus"
         echo "Files restore Job logs:"
-        oc logs job/$TASK-$DRUPALSITE -n openshift-cern-cephfs
+        oc logs job/$TASK-$DRUPALSITE -n $VELERO_NAMESPACE
 
         echo "--------------------------- Drupalsite database restore ---------------------------"
         export TASK=db-restore-$DATE
         export SERVING_POD_IMAGE=$(oc get -n $NAMESPACE drupalsite/$(params.drupalSite) -o=jsonpath='{.status.servingPodImage}')
         export OPERATION="database-restore"
-        export ARGS="-f database_backup"
+        export ARGS="-f database_backup.sql"
         envsubst < /tekton-task-templates/drupal_operation_job.yaml | oc create -n $NAMESPACE -f -
         oc wait --for=condition=complete job/$TASK-$(params.drupalSite)
         jobStatus=$(oc get job/$TASK-$(params.drupalSite) -o=jsonpath='{.status.conditions[*].type}' | grep -i -E 'failed|complete' || echo "Failed")

tekton-task-templates/restore_pv_job.yaml

@@ -2,7 +2,7 @@ kind: Job
 apiVersion: batch/v1
 metadata:
   name: $TASK-$DRUPALSITE
-  namespace: openshift-cern-cephfs
+  namespace: $VELERO_NAMESPACE
   labels:
     app: velero-restore
 spec: