Allow setting loopback as direct routing device in Cilium 1.15+

cilium/cilium#31200
metal-stack · May 10, 2024 · 5a0155f · 5a0155f
1 parent c96029d
commit 5a0155f
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 2 deletions.
diff --git a/hack/api-reference/cilium.md b/hack/api-reference/cilium.md
@@ -205,6 +205,18 @@ int
 </tr>
 <tr>
 <td>
+<code>directRoutingDevice</code></br>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>DirectRoutingDevice the device using for direct routing between Cilium nodes</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>loadBalancingMode</code></br>
 <em>
 <a href="#cilium.networking.extensions.gardener.cloud/v1alpha1.LoadBalancingMode">

diff --git a/pkg/apis/cilium/types_network.go b/pkg/apis/cilium/types_network.go
@@ -196,6 +196,8 @@ type NetworkConfig struct {
 	MTU *int
 	// Devices is the list of devices facing cluster/external network
 	Devices []string
+	// DirectRoutingDevice the device using for direct routing between Cilium nodes
+	DirectRoutingDevice *string
 	// LoadBalancingMode configuration, it should be 'snat', 'dsr' or 'hybrid'
 	LoadBalancingMode *LoadBalancingMode
 	// IPv4NativeRoutingCIDRMode will set the ipv4 native routing cidr from the network configs node's cidr if enabled.

diff --git a/pkg/apis/cilium/v1alpha1/types_network.go b/pkg/apis/cilium/v1alpha1/types_network.go
@@ -202,6 +202,9 @@ type NetworkConfig struct {
 	// Devices is the list of devices facing cluster/external network
 	// +optional
 	Devices []string `json:"devices,omitempty"`
+	// DirectRoutingDevice the device using for direct routing between Cilium nodes
+	// +optional
+	DirectRoutingDevice *string `json:"directRoutingDevice,omitempty"`
 	// LoadBalancingMode configuration, it should be 'snat', 'dsr' or 'hybrid'
 	// +optional
 	LoadBalancingMode *LoadBalancingMode `json:"loadBalancingMode,omitempty"`

diff --git a/pkg/apis/cilium/v1alpha1/zz_generated.conversion.go b/pkg/apis/cilium/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/cilium/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/cilium/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/cilium/zz_generated.deepcopy.go b/pkg/apis/cilium/zz_generated.deepcopy.go
diff --git a/pkg/charts/config.go b/pkg/charts/config.go
@@ -94,8 +94,9 @@ type hubble struct {
 // nodePort enablement for cilium
 type nodePort struct {
 	// Nodeport Enabled is used to define whether Nodeport is required or not.
-	Enabled bool                        `json:"enabled"`
-	Mode    ciliumv1alpha1.NodePortMode `json:"mode"`
+	Enabled             bool                        `json:"enabled"`
+	Mode                ciliumv1alpha1.NodePortMode `json:"mode"`
+	DirectRoutingDevice string                      `json:"directRoutingDevice"`
 }
 
 // operator configuration for cilium

diff --git a/pkg/charts/utils.go b/pkg/charts/utils.go
@@ -270,6 +270,10 @@ func generateChartValues(config *ciliumv1alpha1.NetworkConfig, network *extensio
 		globalConfig.Devices = config.Devices
 	}
 
+	if config.DirectRoutingDevice != nil {
+		globalConfig.NodePort.DirectRoutingDevice = *config.DirectRoutingDevice
+	}
+
 	// check if load balancing mode is set
 	if config.LoadBalancingMode != nil {
 		globalConfig.BPF = bpf{