From 64d77b398278d72cddb623f38c5b9a345afcd0ec Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Tue, 19 Apr 2022 13:07:13 +0200
Subject: [PATCH 1/3] Fix for checking status on backup ClusterTask
---
chart/drupal-operations/templates/drupalsite-backup.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/drupal-operations/templates/drupalsite-backup.yaml b/chart/drupal-operations/templates/drupalsite-backup.yaml
index 964d32a..e1cc493 100644
--- a/chart/drupal-operations/templates/drupalsite-backup.yaml
+++ b/chart/drupal-operations/templates/drupalsite-backup.yaml
@@ -38,6 +38,6 @@ spec:
export PROJECT_HASH=$(printf '%s' "$NAMESPACE" | md5sum | awk '{print $1}')
export VELERO_NAMESPACE={{ .Values.veleroNamespace }}
envsubst < /tekton-task-templates/backup_resource.yaml | oc create -f -
- timeout 120s sh -c -- 'while [ $(oc get backup/$RESOURCE_NAME -n $VELERO_NAMESPACE -o jsonpath='{.status.phase}') != "Completed" ]; do printf "Backup in progress\n"; sleep 2s; done'
+ timeout 120s sh -c -- 'while [[ $(oc get backup/$RESOURCE_NAME -n $VELERO_NAMESPACE -o jsonpath='{.status.phase}') != "Completed" ]]; do printf "Backup in progress\n"; sleep 2s; done'
backupStatus=$(oc get backup/$RESOURCE_NAME -n $VELERO_NAMESPACE -o=jsonpath='{.status.phase}' | grep -i -E 'failed|completed|partiallyfailed' || echo "Failed")
echo "DrupalSite backup status: $backupStatus"
--
GitLab
From b2c0a9daba01a07a048e0dff659e019b4fa557d9 Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Tue, 19 Apr 2022 13:33:43 +0200
Subject: [PATCH 2/3] Update openstack client installation for CentOS Stream 8
---
Dockerfile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 34a4264..d7ffb2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,14 +6,15 @@ LABEL maintainer="Drupal Admins <drupal-admins@cern.ch>"
# TODO: Download the binary for restic install, instead of using copart/restic repo
ARG restic_version=0.12.1
-RUN yum install epel-release -y && \
+RUN yum update -y && \
+ yum install epel-release -y && \
# install restic
yum install yum-plugin-copr -y && \
yum copr enable copart/restic -y && \
yum install restic-${restic_version} -y && \
# we need this to interact with manila OpenStack to get CephFS information
- yum install centos-release-openstack-train -y && \
- yum install -y /usr/bin/openstack --disableplugin=protectbase && \
+ yum install centos-release-openstack-xena -y && \
+ yum install -y /usr/bin/openstack python3-requests-kerberos && \
yum clean all
COPY ./tekton-task-templates /tekton-task-templates
--
GitLab
From 1ce8059a9c520e716d5c317cb5c175cb69842e70 Mon Sep 17 00:00:00 2001
From: Konstantinos Samaras-Tsakiris <konstantinos.samaras-tsakiris@cern.ch>
Date: Thu, 21 Apr 2022 17:10:20 +0200
Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s)
---
chart/drupal-operations/templates/drupalsite-backup.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/drupal-operations/templates/drupalsite-backup.yaml b/chart/drupal-operations/templates/drupalsite-backup.yaml
index e1cc493..855da4a 100644
--- a/chart/drupal-operations/templates/drupalsite-backup.yaml
+++ b/chart/drupal-operations/templates/drupalsite-backup.yaml
@@ -38,6 +38,6 @@ spec:
export PROJECT_HASH=$(printf '%s' "$NAMESPACE" | md5sum | awk '{print $1}')
export VELERO_NAMESPACE={{ .Values.veleroNamespace }}
envsubst < /tekton-task-templates/backup_resource.yaml | oc create -f -
- timeout 120s sh -c -- 'while [[ $(oc get backup/$RESOURCE_NAME -n $VELERO_NAMESPACE -o jsonpath='{.status.phase}') != "Completed" ]]; do printf "Backup in progress\n"; sleep 2s; done'
+ timeout 120s sh -c -- 'while [[ $(oc get "backup/$RESOURCE_NAME" -n "$VELERO_NAMESPACE" -o jsonpath='{.status.phase}') != "Completed" ]]; do printf "Backup in progress\n"; sleep 2s; done'
backupStatus=$(oc get backup/$RESOURCE_NAME -n $VELERO_NAMESPACE -o=jsonpath='{.status.phase}' | grep -i -E 'failed|completed|partiallyfailed' || echo "Failed")
echo "DrupalSite backup status: $backupStatus"
--
GitLab