From 704d14ac080eb5e37deadf00945feed5ebe6bbeb Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 24 Aug 2021 18:42:51 +0200
Subject: [PATCH] k8s is helm-chart only

(cherry picked from commit 0a6f3448ec082faeb4fe9db18536902bb88e15c1)

# Conflicts:
#	docs/kubernetes/mailu/index.rst
---
 docs/kubernetes/mailu/index.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/kubernetes/mailu/index.rst b/docs/kubernetes/mailu/index.rst
index 853f3689..b343e53c 100644
--- a/docs/kubernetes/mailu/index.rst
+++ b/docs/kubernetes/mailu/index.rst
@@ -3,7 +3,11 @@
 Kubernetes setup
 ================
 
+<<<<<<< HEAD
 Please see `the Helm Chart documentation`_.
+=======
+Hold up! These instructions are not recommended for setting up Mailu in a production Kubernetes environment. Please see `the Helm Chart documentation`_.
+>>>>>>> 0a6f3448 (k8s is helm-chart only)
 
 We are looking for maintainers: if you are interested please join our `Matrix`_ room.