Backport of CNI: use tmpfs location for ipam plugin into release/1.9.x (

#24681) Co-authored-by: Tim Gross <tgross@hashicorp.com>
hashicorp · Dec 16, 2024 · 8fe803a · 8fe803a
1 parent 045cff9
commit 8fe803a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/.changelog/24650.txt b/.changelog/24650.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+networking: use a tmpfs location for the state of CNI IPAM plugin used by bridge mode, to fix a bug where allocations would fail to restore after host reboot
+```
diff --git a/client/allocrunner/cni/bridge.go b/client/allocrunner/cni/bridge.go
@@ -58,9 +58,10 @@ func NewNomadBridgeConflist(conf NomadBridgeConfig) Conflist {
 			ForceAddress: true,
 			HairpinMode:  conf.HairpinMode,
 			Ipam: IPAM{
-				Type:   "host-local",
-				Ranges: ipRanges,
-				Routes: ipRoutes,
+				Type:    "host-local",
+				Ranges:  ipRanges,
+				Routes:  ipRoutes,
+				DataDir: "/var/run/cni",
 			},
 		},
 		Firewall{

diff --git a/client/allocrunner/cni/plugins.go b/client/allocrunner/cni/plugins.go
@@ -20,9 +20,10 @@ type Bridge struct {
 	Ipam         IPAM   `json:"ipam"`
 }
 type IPAM struct {
-	Type   string    `json:"type"`
-	Ranges [][]Range `json:"ranges"`
-	Routes []Route   `json:"routes"`
+	Type    string    `json:"type"`
+	Ranges  [][]Range `json:"ranges"`
+	Routes  []Route   `json:"routes"`
+	DataDir string    `json:"dataDir"`
 }
 type Range struct {
 	Subnet string `json:"subnet"`

diff --git a/client/allocrunner/test_fixtures/bad_input.conflist.json b/client/allocrunner/test_fixtures/bad_input.conflist.json
@@ -25,7 +25,8 @@
 					{
 						"dst": "0.0.0.0/0"
 					}
-				]
+				],
+				"dataDir": "/var/run/cni"
 			}
 		},
 		{

diff --git a/client/allocrunner/test_fixtures/consul-cni.conflist.json b/client/allocrunner/test_fixtures/consul-cni.conflist.json
@@ -25,7 +25,8 @@
 					{
 						"dst": "0.0.0.0/0"
 					}
-				]
+				],
+				"dataDir": "/var/run/cni"
 			}
 		},
 		{

diff --git a/client/allocrunner/test_fixtures/empty.conflist.json b/client/allocrunner/test_fixtures/empty.conflist.json
@@ -25,7 +25,8 @@
 					{
 						"dst": "0.0.0.0/0"
 					}
-				]
+				],
+				"dataDir": "/var/run/cni"
 			}
 		},
 		{

diff --git a/client/allocrunner/test_fixtures/hairpin.conflist.json b/client/allocrunner/test_fixtures/hairpin.conflist.json
@@ -25,7 +25,8 @@
 					{
 						"dst": "0.0.0.0/0"
 					}
-				]
+				],
+				"dataDir": "/var/run/cni"
 			}
 		},
 		{

diff --git a/client/allocrunner/test_fixtures/ipv6.conflist.json b/client/allocrunner/test_fixtures/ipv6.conflist.json
@@ -33,7 +33,8 @@
 					{
 						"dst": "::/0"
 					}
-				]
+				],
+				"dataDir": "/var/run/cni"
 			}
 		},
 		{
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,8 @@ @@
     					{
     						"dst": "0.0.0.0/0"
     					}
-    				]
+    				],
+    				"dataDir": "/var/run/cni"
     			}
     		},
     		{
@@ Expand Down @@