Skip to content
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

Jump to bottom

Remove peering status handling in network peering reconciler #1064

Merged
merged 1 commit into from
May 14, 2024
Merged

Remove peering status handling in network peering reconciler #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions cmd/ironcore-controller-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ func main() {
loadBalancerController,
loadBalancerEphemeralPrefixController,
networkProtectionController,
networkPeeringController,
networkReleaseController,
networkInterfaceEphemeralPrefixController,
networkInterfaceEphemeralVirtualIPController,
Expand Down
37 changes: 0 additions & 37 deletions internal/controllers/networking/network_peering_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func (r *NetworkPeeringReconciler) reconcile(ctx context.Context, log logr.Logge
log.V(1).Info("Reconcile")

var peeringClaimRefs []networkingv1alpha1.NetworkPeeringClaimRef
var peeringNames []string

for _, peering := range network.Spec.Peerings {
peeringClaimRef, err := r.reconcilePeering(ctx, log, network, peering)
Expand All @@ -59,10 +58,6 @@ func (r *NetworkPeeringReconciler) reconcile(ctx context.Context, log logr.Logge
if peeringClaimRef != (networkingv1alpha1.NetworkPeeringClaimRef{}) {
peeringClaimRefs = append(peeringClaimRefs, peeringClaimRef)
}

if peering.Name != "" {
peeringNames = append(peeringNames, peering.Name)
}
}

if len(peeringClaimRefs) > 0 {
Expand All @@ -72,42 +67,10 @@ func (r *NetworkPeeringReconciler) reconcile(ctx context.Context, log logr.Logge
}
}

if len(peeringNames) > 0 {
log.V(1).Info("Network peering status require network status update")
if err := r.updateStatus(ctx, log, network, peeringNames); err != nil {
return ctrl.Result{}, fmt.Errorf("error updating network status: %w", err)
}
}

log.V(1).Info("Reconciled")
return ctrl.Result{}, nil
}

func (r *NetworkPeeringReconciler) updateStatus(
ctx context.Context,
log logr.Logger,
network *networkingv1alpha1.Network,
peeringNames []string,
) error {
base := network.DeepCopy()
newStatusPeerings := make([]networkingv1alpha1.NetworkPeeringStatus, 0, len(peeringNames))
for _, name := range peeringNames {
newStatusPeerings = append(newStatusPeerings, networkingv1alpha1.NetworkPeeringStatus{
Name: name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})
}
network.Status.Peerings = newStatusPeerings

log.V(1).Info("Updating network status peerings", "", network.Status.Peerings)
if err := r.Status().Patch(ctx, network, client.StrategicMergeFrom(base)); err != nil {
return fmt.Errorf("error updating network status peerings: %w", err)
}
log.V(1).Info("Updated network status peerings")

return nil
}

func (r *NetworkPeeringReconciler) updateSpec(
ctx context.Context,
log logr.Logger,
Expand Down
70 changes: 0 additions & 70 deletions internal/controllers/networking/network_peering_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network4.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
}, networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[1].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
}, networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[2].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network2)).
Expand All @@ -166,10 +156,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network1.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network2.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network3)).
Expand All @@ -180,10 +166,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network1.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network3.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network4)).
Expand All @@ -194,10 +176,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network1.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network4.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

By("deleting the networks")
Expand Down Expand Up @@ -272,10 +250,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network2.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network2)).
Expand All @@ -286,10 +260,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network1.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network2.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

By("deleting the networks")
Expand Down Expand Up @@ -356,20 +326,12 @@ var _ = Describe("NetworkPeeringController", func() {
Should(SatisfyAll(
HaveField("Spec.PeeringClaimRefs", BeEmpty()),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network2)).
Should(SatisfyAll(
HaveField("Spec.PeeringClaimRefs", BeEmpty()),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network2.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

By("deleting the networks")
Expand Down Expand Up @@ -489,13 +451,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network3.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
}, networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[1].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network2)).
Expand All @@ -510,13 +465,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network3.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network2.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
}, networkingv1alpha1.NetworkPeeringStatus{
Name: network2.Spec.Peerings[1].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network3)).
Expand All @@ -531,13 +479,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network2.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network3.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
}, networkingv1alpha1.NetworkPeeringStatus{
Name: network3.Spec.Peerings[1].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

By("deleting the networks")
Expand Down Expand Up @@ -616,13 +557,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network3.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
}, networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[1].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network3)).
Expand All @@ -633,10 +567,6 @@ var _ = Describe("NetworkPeeringController", func() {
UID: network1.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network3.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

By("deleting the networks")
Expand Down
8 changes: 0 additions & 8 deletions internal/controllers/networking/network_protection_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,6 @@ var _ = Describe("NetworkProtectionReconciler", func() {
UID: network2.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network1.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

Eventually(Object(network2)).
Expand All @@ -300,10 +296,6 @@ var _ = Describe("NetworkProtectionReconciler", func() {
UID: network1.UID,
})),
HaveField("Status.State", Equal(networkingv1alpha1.NetworkStateAvailable)),
HaveField("Status.Peerings", ConsistOf(networkingv1alpha1.NetworkPeeringStatus{
Name: network2.Spec.Peerings[0].Name,
State: networkingv1alpha1.NetworkPeeringStatePending,
})),
))

By("deleting the network-1")
Expand Down