From 4faf2161b21adc8164996370b53976ca6701dd92 Mon Sep 17 00:00:00 2001
From: Spyros Trigazis <spyridon.trigazis@cern.ch>
Date: Mon, 22 Jun 2020 18:36:12 +0300
Subject: [PATCH] [cern] Set containerRuntime for fluentd

While installing the fluentd helm chart set the
containerRuntime. This is needed to collect
logs containerd logs.

Change-Id: I276511de3d75ddaf834a3fccd4baab4d299f2b92
Signed-off-by: Spyros Trigazis <spyridon.trigazis@cern.ch>
---
 .../templates/kubernetes/helm/cern-central-monitoring-logging.sh | 1 +
 magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/magnum/drivers/common/templates/kubernetes/helm/cern-central-monitoring-logging.sh b/magnum/drivers/common/templates/kubernetes/helm/cern-central-monitoring-logging.sh
index 018144a5b..194f61d77 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/cern-central-monitoring-logging.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/cern-central-monitoring-logging.sh
@@ -56,6 +56,7 @@ data:
       producer: ${LOGGING_PRODUCER}
       endpoint: ${LOGGING_HTTP_DESTINATION}
       includeInternal: ${LOGGING_INCLUDE_INTERNAL}
+    containerRuntime: ${CONTAINER_RUNTIME}
 
 ---
 
diff --git a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
index c6787c657..a1cfdd556 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/cern-chart.sh
@@ -74,6 +74,7 @@ data:
         producer: ${LOGGING_PRODUCER}
         endpoint: ${LOGGING_HTTP_DESTINATION}
         includeInternal: ${LOGGING_INCLUDE_INTERNAL}
+      containerRuntime: ${CONTAINER_RUNTIME}
     landb-sync:
       enabled: ${LANDB_SYNC_ENABLED}
     prometheus-cern:
-- 
GitLab