From 14824c28b863f0028822f3ab92f8b9199cda7322 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 15 May 2021 23:44:29 +0200
Subject: k8s: cleanup CRI socket handling

---
 roles/apps/nextcloud/templates/nextcloud-occ.j2 | 3 ---
 roles/apps/nextcloud/templates/run-cron.sh.j2   | 4 ----
 2 files changed, 7 deletions(-)

(limited to 'roles/apps/nextcloud')

diff --git a/roles/apps/nextcloud/templates/nextcloud-occ.j2 b/roles/apps/nextcloud/templates/nextcloud-occ.j2
index 7e2a51d4..f12f1259 100755
--- a/roles/apps/nextcloud/templates/nextcloud-occ.j2
+++ b/roles/apps/nextcloud/templates/nextcloud-occ.j2
@@ -9,9 +9,6 @@ if [ -z "$INST_NAME" ]; then
 fi
 
 set -eu
-{% if kubernetes_cri_socket %}
-export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
-{% endif %}
 
 pod_id=$(crictl pods -q --state ready --name "^nextcloud-$INST_NAME-{{ ansible_nodename }}$")
 if [ -z "$pod_id" ]; then echo "Pod not found"; exit 1; fi
diff --git a/roles/apps/nextcloud/templates/run-cron.sh.j2 b/roles/apps/nextcloud/templates/run-cron.sh.j2
index 755b7cb1..455bc3ec 100644
--- a/roles/apps/nextcloud/templates/run-cron.sh.j2
+++ b/roles/apps/nextcloud/templates/run-cron.sh.j2
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-{% if kubernetes_cri_socket %}
-export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}"
-{% endif %}
-
 POD_NAME="{{ item }}-$(hostname)"
 POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
 CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
-- 
cgit v1.2.3