From c81dd599dc0fa286226140cc681c006fefc1a1cf Mon Sep 17 00:00:00 2001
From: Dario Tranchitella <dario@tranchitella.eu>
Date: Wed, 27 May 2026 11:35:36 +0200
Subject: [PATCH] fix(konnectivity): avoiding infinite reconciliation due to
 args sorting (#1160)

Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>
---
 .../controlplane/konnectivity_server.go       | 46 +++++++++++++++----
 internal/utilities/args.go                    | 20 --------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/internal/builders/controlplane/konnectivity_server.go b/internal/builders/controlplane/konnectivity_server.go
index f4ed997..e310b9e 100644
--- a/internal/builders/controlplane/konnectivity_server.go
+++ b/internal/builders/controlplane/konnectivity_server.go
@@ -5,6 +5,7 @@ package controlplane
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/blang/semver"
 	appsv1 "k8s.io/api/apps/v1"
@@ -168,13 +169,22 @@ func (k Konnectivity) RemovingVolumes(podSpec *corev1.PodSpec) {
 }
 
 func (k Konnectivity) RemovingKubeAPIServerContainerArg(podSpec *corev1.PodSpec) {
-	if found, index := utilities.HasNamedContainer(podSpec.Containers, apiServerContainerName); found {
-		argsMap := utilities.ArgsFromSliceToMap(podSpec.Containers[index].Args)
-
-		if utilities.ArgsRemoveFlag(argsMap, "--egress-selector-config-file") {
-			podSpec.Containers[index].Args = utilities.ArgsFromMapToSlice(argsMap)
-		}
+	found, index := utilities.HasNamedContainer(podSpec.Containers, apiServerContainerName)
+	if !found {
+		return
 	}
+	//nolint:prealloc
+	var parsedArgs []string
+
+	for _, v := range podSpec.Containers[index].Args {
+		if strings.HasPrefix(v, "--egress-selector-config-file") || strings.HasPrefix(v, "--egress-selector-config-file=") {
+			continue
+		}
+
+		parsedArgs = append(parsedArgs, v)
+	}
+
+	podSpec.Containers[index].Args = parsedArgs
 }
 
 func (k Konnectivity) RemovingContainer(podSpec *corev1.PodSpec) {
@@ -193,12 +203,28 @@ func (k Konnectivity) buildVolumeMounts(podSpec *corev1.PodSpec) {
 	if !found {
 		return
 	}
-	// Adding the egress selector config file flag
-	args := utilities.ArgsFromSliceToMap(podSpec.Containers[index].Args)
+	// Adding the egress selector config file flag:
+	// we can't rely on maps since not preserving order of arguments,
+	// api-server has sensitive parameters.
+	egressConfigFlag := fmt.Sprintf("--egress-selector-config-file=%s", konnectivityEgressSelectorConfigurationPath)
 
-	utilities.ArgsAddFlagValue(args, "--egress-selector-config-file", konnectivityEgressSelectorConfigurationPath)
+	var foundFlag bool
 
-	podSpec.Containers[index].Args = utilities.ArgsFromMapToSlice(args)
+	for i, v := range podSpec.Containers[index].Args {
+		if !strings.HasPrefix(v, "--egress-selector-config-file") {
+			continue
+		}
+
+		if v != egressConfigFlag {
+			podSpec.Containers[index].Args[i] = egressConfigFlag
+		}
+
+		foundFlag = true
+	}
+
+	if !foundFlag {
+		podSpec.Containers[index].Args = append(podSpec.Containers[index].Args, egressConfigFlag)
+	}
 
 	vFound, vIndex := false, 0 //nolint:wastedassign
 	// Patching the volume mounts
diff --git a/internal/utilities/args.go b/internal/utilities/args.go
index d3ead1f..4f8aec6 100644
--- a/internal/utilities/args.go
+++ b/internal/utilities/args.go
@@ -39,23 +39,3 @@ func ArgsFromMapToSlice(args map[string]string) (slice []string) {
 
 	return slice
 }
-
-// ArgsRemoveFlag removes a flag from the arguments map, returning true if found and removed.
-func ArgsRemoveFlag(args map[string]string, flag string) bool {
-	if _, found := args[flag]; found {
-		delete(args, flag)
-
-		return true
-	}
-
-	return false
-}
-
-// ArgsAddFlagValue performs upsert of a flag in the arguments map, returning true if created.
-func ArgsAddFlagValue(args map[string]string, flag, value string) bool {
-	_, ok := args[flag]
-
-	args[flag] = value
-
-	return !ok
-}