Merge pull request #535 from bpfman/revert-493-reverse-unload-order

Revert "Reverse program unload order to respect map ownership"

Author: frobware

controllers/bpfman-agent/cl_application_program.go

@@ -764,11 +764,7 @@ func (r *ClBpfApplicationReconciler) load(ctx context.Context) error {
 }
 
 func (r *ClBpfApplicationReconciler) unload(ctx context.Context) {
-	// Unload in reverse order because the first program is the map owner
-	// and subsequent programs may share its maps. Dependents must be
-	// unloaded before the map owner.
-	for i := len(r.currentAppState.Status.Programs) - 1; i >= 0; i-- {
-		program := r.currentAppState.Status.Programs[i]
+	for i, program := range r.currentAppState.Status.Programs {
 		if program.ProgramId != nil {
 			err := bpfmanagentinternal.UnloadBpfmanProgram(ctx, r.BpfmanClient, *program.ProgramId)
 			if err != nil {

controllers/bpfman-agent/ns_application_program.go

@@ -681,11 +681,7 @@ func (r *NsBpfApplicationReconciler) load(ctx context.Context) error {
 }
 
 func (r *NsBpfApplicationReconciler) unload(ctx context.Context) {
-	// Unload in reverse order because the first program is the map owner
-	// and subsequent programs may share its maps. Dependents must be
-	// unloaded before the map owner.
-	for i := len(r.currentAppState.Status.Programs) - 1; i >= 0; i-- {
-		program := r.currentAppState.Status.Programs[i]
+	for i, program := range r.currentAppState.Status.Programs {
 		if program.ProgramId != nil {
 			err := bpfmanagentinternal.UnloadBpfmanProgram(ctx, r.BpfmanClient, *program.ProgramId)
 			if err != nil {