Skip to content

avoid GNP deletion when network is refering to it #788

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 1 commit into from
Feb 17, 2025
Merged

avoid GNP deletion when network is refering to it #788

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
7 changes: 1 addition & 6 deletions pkg/controller/gkenetworkparamset/gkenetworkparamset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,12 +535,7 @@ func (c *Controller) handleGNPDelete(ctx context.Context, params *networkv1.GKEN
return c.executeGNPDelete(ctx, params, network)
}

if networkStillRefersToGNP && !network.InUse() {
return c.executeGNPDelete(ctx, params, network)
}

// if the network is in use, this GNP object will get reconciled again when the network's in use status changes.

// Prevent removal if there is still a network refering to this GNP
return nil
}

Expand Down
10 changes: 3 additions & 7 deletions pkg/controller/gkenetworkparamset/gkenetworkparamset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,20 +1204,19 @@ func TestCrossValidateNetworkAndGnp(t *testing.T) {

}

func TestHandleGKENetworkParamSetDelete_NetworkInUse(t *testing.T) {
func TestHandleGKENetworkParamSetDelete_NetworkPresent(t *testing.T) {

tests := []struct {
name string
networkUpdateFn func(ctx context.Context, networkName string, networkClient *networkfake.Clientset)
}{
{name: "Network no longer InUse",
{name: "Network no longer refer to GNP",
networkUpdateFn: func(ctx context.Context, networkName string, networkClient *networkfake.Clientset) {
network, err := networkClient.NetworkingV1().Networks().Get(ctx, networkName, metav1.GetOptions{})
if err != nil {
t.Fatalf("Failed to get Network: %v", err)
}
// change Network to not in use
network.SetAnnotations(map[string]string{})
network.Spec.ParametersRef.Name = "non-existent"
_, err = networkClient.NetworkingV1().Networks().Update(ctx, network, metav1.UpdateOptions{})
if err != nil {
t.Fatalf("Failed to update Network status: %v", err)
Expand Down Expand Up @@ -1266,9 +1265,6 @@ func TestHandleGKENetworkParamSetDelete_NetworkInUse(t *testing.T) {
network := &networkv1.Network{
ObjectMeta: metav1.ObjectMeta{
Name: networkName,
Annotations: map[string]string{
networkv1.NetworkInUseAnnotationKey: networkv1.NetworkInUseAnnotationValTrue,
},
},
Spec: networkv1.NetworkSpec{
Type: networkv1.DeviceNetworkType,
Expand Down