Fix templates & restic password file name

chart/cluster-tasks/templates/clear-cache.yaml

@@ -21,7 +21,8 @@ spec:
       - |-
         echo "--------------------------- Clear cache ---------------------------"
         echo "Drupal site name: $(params.drupalSite)"
-        export TASK=clear-cache
+        export DATE=$(date +%F-%H-%M)
+        export TASK=clear-cache-$DATE
         export OPERATION="clear-cache"
         export DRUPALSITE=$(params.drupalSite)
         export NAMESPACE=$(params.namespace)

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

+apiVersion: tekton.dev/v1beta1
+kind: ClusterTask
+metadata:
+  name: database-restore
+spec:
+  params:
+    - name: drupalSite
+      type: string
+      description: The name of the drupal site
+    - name: namespace
+      type: string
+      description: The namespace of the drupal site
+  steps:
+    - name: database-restore
+      image: gitlab-registry.cern.ch/drupal/paas/drupal-operations/openshift-cli:velero-restore
+      imagePullPolicy: Always
+      command:
+        - /bin/sh
+        - '-c'
+      args:
+      - |-
+        echo "--------------------------- Database restore ---------------------------"
+        echo "Drupal site name: $(params.drupalSite)"
+        export DATE=$(date +%F-%H-%M)
+        export TASK=database-restore-$DATE
+        export OPERATION="database-restore"
+        export DRUPALSITE=$(params.drupalSite)
+        export ARGS="-f 'database_backup.sql'"
+        export NAMESPACE=$(params.namespace)
+        export SERVING_POD_IMAGE=$(oc get -n $(params.namespace) drupalsite/$(params.drupalSite) -o=jsonpath='{.status.servingPodImage}')
+        envsubst < /tekton-task-templates/drupal_operation_job.yaml | oc create -n $(params.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")
+        echo "Job status: $jobStatus"
+        echo "Job logs:"
+        oc logs job/$TASK-$DRUPALSITE -n $(params.namespace)

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

@@ -43,7 +43,7 @@ spec:
         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.sql"
+        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/drupal_operation_job.yaml

@@ -16,8 +16,8 @@ spec:
       containers:
       - command:
         - sh
-        - /operations/$OPERATION.sh 
-        - $ARGS
+        - '-c'
+        - /operations/$OPERATION.sh $ARGS
         env:
         - name: DRUPAL_SHARED_VOLUME
           value: /drupal-data

tekton-task-templates/restore_pv_job.yaml

@@ -43,12 +43,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: cephfs-backup-secrets
-                  key: cephfs-backup-s3-access-key
+                  key: cephfsBackupS3AccessKey
             - name: AWS_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   name: cephfs-backup-secrets
-                  key: cephfs-backup-s3-secret-key
+                  key: cephfsBackupS3SecretKey
           resources: {}
           volumeMounts:
             - name: openstack-credentials
@@ -69,13 +69,7 @@ spec:
           imagePullPolicy: Always
           securityContext:
             privileged: true
-            runAsUser: 0
       restartPolicy: Never
       terminationGracePeriodSeconds: 30
-      dnsPolicy: ClusterFirst
-      nodeSelector:
-        node-role.kubernetes.io/infra: ''
       serviceAccountName: $RESTORE_SERVICE_ACCOUNT
       serviceAccount: $RESTORE_SERVICE_ACCOUNT
-      securityContext: {}
-      schedulerName: default-scheduler

velero-restic-restore/restore_pvs.sh

@@ -89,7 +89,7 @@ mount -t ceph "$CEPHFS_PATH_PV" -o name="$PV_NAME",noatime,secret="$CEPHFS_USERK
 mkdir -p /restore
 chmod 777 /restore
 
-restic -p /tmp/restic_password -r "$RESTIC_REPO" restore "$RESTIC_SNAPSHOT_ID" --target /restore
+restic -p /tmp/repository-password -r "$RESTIC_REPO" restore "$RESTIC_SNAPSHOT_ID" --target /restore
 
 rsync -avz /restore/ /mnt/ --delete