summaryrefslogtreecommitdiff
path: root/roles/apps/nextcloud/templates
diff options
context:
space:
mode:
Diffstat (limited to 'roles/apps/nextcloud/templates')
-rwxr-xr-xroles/apps/nextcloud/templates/nextcloud-upgrade.j29
-rw-r--r--roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j23
2 files changed, 11 insertions, 1 deletions
diff --git a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2 b/roles/apps/nextcloud/templates/nextcloud-upgrade.j2
index 27bc6222..13178f0f 100755
--- a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2
+++ b/roles/apps/nextcloud/templates/nextcloud-upgrade.j2
@@ -38,6 +38,15 @@ else
crictl pull "docker.io/library/nextcloud:$VERSION"
echo ""
fi
+{% if nextcloud_zfs is defined %}
+
+echo "*** creating ZFS snapshot"
+echo ""
+
+IMAGE_NAME_ESCAPED=${IMAGE_NAME/\//\\/}
+CURRENT_VERSION=$(cat "$K8S_MANIFEST_FILE" | awk '/image: "'"$IMAGE_NAME_ESCAPED"':.*"/ { print($2) }' | tr -d '"' | cut -d ':' -f 2)
+zfs snapshot "{{ nextcloud_zfs.pool }}/{{ nextcloud_zfs.name }}/$INST_NAME@upgrade_$CURRENT_VERSION-to-$VERSION""_$(date '+%Y-%m-%m_%H:%M:%S')"
+{% endif %}
echo "*** Patching manifest file"
echo ""
diff --git a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2 b/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
index b587cad3..6100a2ab 100644
--- a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
+++ b/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
@@ -2,7 +2,8 @@ securityContext:
allowPrivilegeEscalation: false
containers:
- name: nextcloud
- image: "nextcloud{% if 'custom_image' in item.value %}/{{ item.key }}{% endif %}:{{ item.value.version }}"
+{# image: "nextcloud{% if 'custom_image' in item.value %}/{{ item.key }}{% endif %}:{{ item.value.version }}" #}
+ image: "nextcloud/{{ item.key }}:{{ item.value.version }}"
securityContext:
runAsUser: {{ nextcloud_app_uid }}
runAsGroup: {{ nextcloud_app_gid }}