fix(elknet): Make bridge customizable to prevent pod networking con…

…flicts
extra2000 · Mar 13, 2021 · 9868089 · 9868089
1 parent 8b57840
commit 9868089
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/elk/defaults.yaml b/elk/defaults.yaml
@@ -10,6 +10,7 @@ elk:
       subnet: 10.77.1.0/24
       gateway: 10.77.1.1
       domain_name: elknet
+      bridge: cni-podman0
   elasticsearch:
     image:
       name: docker.io/elasticsearch:7.10.1

diff --git a/elk/files/podman-network-elknet.conflist.jinja b/elk/files/podman-network-elknet.conflist.jinja
@@ -4,7 +4,7 @@
   "plugins": [
     {
       "type": "bridge",
-      "bridge": "cni-podman0",
+      "bridge": "{{ pod.network.bridge }}",
       "isGateway": true,
       "ipMasq": true,
       "hairpinMode": true,

diff --git a/pillar.example b/pillar.example
@@ -11,6 +11,7 @@ elk:
         subnet: 10.77.1.0/24
         gateway: 10.77.1.1
         domain_name: elknet
+        bridge: cni-podman0
     elasticsearch:
       port:
         requests: