Skip to content

Fix NATReconciler to modify NATTable of NIC belonging to NATs Network #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 19, 2024
Merged

Fix NATReconciler to modify NATTable of NIC belonging to NATs Network #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9445dae
fix NATReconciler to modify NATTable of NIC belonging to NATs Network
kasabe28 Feb 13, 2024
f1de621
Add field indexer for NetworkInterface's NetworkRef name field
kasabe28 Feb 15, 2024
2b34ab1
address review comment
kasabe28 Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cmd/controller-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/ironcore-dev/controller-utils/configutils"
ironcorenetv1alpha1 "github.com/ironcore-dev/ironcore-net/api/core/v1alpha1"
apinetclient "github.com/ironcore-dev/ironcore-net/internal/client"
"github.com/ironcore-dev/ironcore-net/internal/controllers"
ironcorenet "github.com/ironcore-dev/ironcore-net/internal/controllers/certificate/ironcore-net"
"github.com/ironcore-dev/ironcore-net/internal/controllers/scheduler"
Expand Down Expand Up @@ -62,6 +63,7 @@ func main() {
flag.Parse()

ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
ctx := ctrl.SetupSignalHandler()

cfg, err := configutils.GetConfig()
if err != nil {
Expand Down Expand Up @@ -165,6 +167,11 @@ func main() {
os.Exit(1)
}

if err := apinetclient.SetupNetworkInterfaceNetworkNameFieldIndexer(ctx, mgr.GetFieldIndexer()); err != nil {
setupLog.Error(err, "unable to setup field indexer", "field", apinetclient.NetworkInterfaceSpecNetworkRefNameField)
os.Exit(1)
}

if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
setupLog.Error(err, "unable to set up health check")
os.Exit(1)
Expand Down
9 changes: 9 additions & 0 deletions internal/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

const NetworkInterfaceSpecNetworkRefNameField = "spec.networkRef.name"

func ClaimNetworkInterfaceNAT(
ctx context.Context,
c client.Client,
Expand Down Expand Up @@ -126,3 +128,10 @@ func ReleaseNetworkInterfaceNAT(ctx context.Context, c client.Client, nic *v1alp
return nil
})
}

func SetupNetworkInterfaceNetworkNameFieldIndexer(ctx context.Context, indexer client.FieldIndexer) error {
return indexer.IndexField(ctx, &v1alpha1.NetworkInterface{}, NetworkInterfaceSpecNetworkRefNameField, func(obj client.Object) []string {
nic := obj.(*v1alpha1.NetworkInterface)
return []string{nic.Spec.NetworkRef.Name}
})
}
4 changes: 4 additions & 0 deletions internal/controllers/controllers_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/ironcore-dev/controller-utils/buildutils"
"github.com/ironcore-dev/ironcore-net/api/core/v1alpha1"
apinetclient "github.com/ironcore-dev/ironcore-net/internal/client"
ironcorenet "github.com/ironcore-dev/ironcore-net/internal/controllers/certificate/ironcore-net"
"github.com/ironcore-dev/ironcore-net/internal/controllers/scheduler"
"github.com/ironcore-dev/ironcore-net/utils/expectations"
Expand Down Expand Up @@ -171,6 +172,9 @@ var _ = BeforeSuite(func() {

mgrCtx, cancel := context.WithCancel(context.Background())
DeferCleanup(cancel)

Expect(apinetclient.SetupNetworkInterfaceNetworkNameFieldIndexer(mgrCtx, k8sManager.GetFieldIndexer())).To(Succeed())

go func() {
defer GinkgoRecover()
Expect(k8sManager.Start(mgrCtx)).To(Succeed(), "failed to start manager")
Expand Down
1 change: 1 addition & 0 deletions internal/controllers/natgateway_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ func (r *NATGatewayReconciler) manageNATTable(
nicList := &v1alpha1.NetworkInterfaceList{}
if err := r.List(ctx, nicList,
client.InNamespace(natGateway.Namespace),
client.MatchingFields{apinetclient.NetworkInterfaceSpecNetworkRefNameField: natGateway.Spec.NetworkRef.Name},
); err != nil {
return 0, 0, fmt.Errorf("error listing network interfaces: %w", err)
}
Expand Down
15 changes: 15 additions & 0 deletions internal/controllers/natgateway_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
var _ = Describe("NATGatewayController", func() {
ns := SetupNamespace(&k8sClient)
network := SetupNetwork(ns)
networkWithoutNAT := SetupNetwork(ns)

It("should correctly reconcile the NAT gateway", func(ctx SpecContext) {
By("creating a NAT gateway")
Expand Down Expand Up @@ -51,6 +52,20 @@ var _ = Describe("NATGatewayController", func() {
}
Expect(k8sClient.Create(ctx, nic)).To(Succeed())

By("creating a network interface using network not claiming NAT Gateway")
nic1 := &v1alpha1.NetworkInterface{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns.Name,
GenerateName: "nic-",
},
Spec: v1alpha1.NetworkInterfaceSpec{
NodeRef: corev1.LocalObjectReference{Name: "my-node"},
NetworkRef: corev1.LocalObjectReference{Name: networkWithoutNAT.Name},
IPs: []net.IP{net.MustParseIP("10.0.0.2")},
},
}
Expect(k8sClient.Create(ctx, nic1)).To(Succeed())

By("waiting for the NAT table to be updated")
natTable := &v1alpha1.NATTable{
ObjectMeta: metav1.ObjectMeta{
Expand Down