From f06cf651f498b69ff7b0f7b4a2d648290536bf66 Mon Sep 17 00:00:00 2001 From: Robert Volkmann Date: Thu, 5 Sep 2024 19:44:35 +0200 Subject: [PATCH] Revert "It is unnecessary to specify "--devices=lo,..." with Cilium 1.15.8" This reverts commit 3e2115d1d09783c7202464d8e69fe1a3cd72a944. --- pkg/admission/mutator/config.go | 2 +- pkg/admission/mutator/defaulter_test.go | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/admission/mutator/config.go b/pkg/admission/mutator/config.go index b3efbbb5..d0fd7b5f 100644 --- a/pkg/admission/mutator/config.go +++ b/pkg/admission/mutator/config.go @@ -68,7 +68,7 @@ func (c *config) ciliumTunnel() ciliumextensionv1alpha1.TunnelMode { } func (c *config) ciliumDevices() []string { - return c.slice("DEFAULTER_CILIUMDEVICES", []string{"lan+"}) + return c.slice("DEFAULTER_CILIUMDEVICES", []string{"lan+", "lo"}) } func (c *config) ciliumDirectRoutingDevice() string { diff --git a/pkg/admission/mutator/defaulter_test.go b/pkg/admission/mutator/defaulter_test.go index c704a6db..246c8d45 100644 --- a/pkg/admission/mutator/defaulter_test.go +++ b/pkg/admission/mutator/defaulter_test.go @@ -8,14 +8,13 @@ import ( gardenv1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" - "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal" "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal/helper" "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal/install" metalv1alpha1 "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal/v1alpha1" + "github.com/stretchr/testify/require" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/serializer" "github.com/metal-stack/metal-lib/pkg/pointer" ) @@ -364,7 +363,7 @@ func Test_defaulter_defaultShoot(t *testing.T) { }, TunnelMode: pointer.Pointer(ciliumextensionv1alpha1.Disabled), MTU: pointer.Pointer(1440), - Devices: []string{"lan+"}, + Devices: []string{"lan+", "lo"}, DirectRoutingDevice: pointer.Pointer("lo"), LoadBalancingMode: pointer.Pointer(ciliumextensionv1alpha1.DSR), IPv4NativeRoutingCIDREnabled: pointer.Pointer(true),