Skip to content

Commit

Permalink
It is unnecessary to specify "--devices=lo,..." with Cilium 1.15.8
Browse files Browse the repository at this point in the history
  • Loading branch information
robertvolkmann committed Sep 5, 2024
1 parent 9fb55eb commit 3e2115d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/admission/mutator/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (c *config) ciliumTunnel() ciliumextensionv1alpha1.TunnelMode {
}

func (c *config) ciliumDevices() []string {
return c.slice("DEFAULTER_CILIUMDEVICES", []string{"lan+", "lo"})
return c.slice("DEFAULTER_CILIUMDEVICES", []string{"lan+"})
}

func (c *config) ciliumDirectRoutingDevice() string {
Expand Down
9 changes: 5 additions & 4 deletions pkg/admission/mutator/defaulter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ 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"
)
Expand Down Expand Up @@ -363,7 +364,7 @@ func Test_defaulter_defaultShoot(t *testing.T) {
},
TunnelMode: pointer.Pointer(ciliumextensionv1alpha1.Disabled),
MTU: pointer.Pointer(1440),
Devices: []string{"lan+", "lo"},
Devices: []string{"lan+"},
DirectRoutingDevice: pointer.Pointer("lo"),
LoadBalancingMode: pointer.Pointer(ciliumextensionv1alpha1.DSR),
IPv4NativeRoutingCIDREnabled: pointer.Pointer(true),
Expand Down

0 comments on commit 3e2115d

Please sign in to comment.