From c9e1647b1325d03c61defeaafb01d66633b71bc2 Mon Sep 17 00:00:00 2001
From: Teddy Andrieux <teddy.andrieux@scality.com>
Date: Thu, 14 Jan 2021 16:02:20 +0100
Subject: [PATCH] salt: Create `/var/run/salt` directory in salt-master
 manifests

Salt process create a `/var/run/salt` directory at startup this
directory is shared between salt-master container and salt-minion
running on the host so it's mounted in the container, since this
directory does not exists at system boot we need to use
`DirectoryOrCreate` so that salt-master does not need salt-minion to
start before being able to start

Fixes: #3022
---
 CHANGELOG.md                                                 | 5 +++++
 salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a0f6cafe2..c6c88a06f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,11 @@
 
 - Bump etcd version to 3.4.13-0 (PR[#3008](https://github.com/scality/metalk8s/pull/3008))
 
+### Bug fixes
+- [#3022](https://github.com/scality/metalk8s/issues/3022) - Ensure salt-master
+  container can start at reboot even if local salt-minion is down
+  (PR [#3041](https://github.com/scality/metalk8s/pull/3041))
+
 ## Release 2.7.0 (in development)
 ### Enhancements
 - Bump Kubernetes version to 1.18.13 (PR[#2973](https://github.com/scality/metalk8s/pull/2973))
diff --git a/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2 b/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2
index 0cae79c390..529bba628e 100644
--- a/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2
+++ b/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2
@@ -118,7 +118,7 @@ spec:
     - name: run
       hostPath:
         path: '/var/run/salt'
-        type: Directory
+        type: DirectoryOrCreate
     {%- for env, archive in archives.items() | sort(attribute='0') %}
     - name: states-{{ env | replace('.', '-') }}
       hostPath: