fix: revert add extraArgs from service-account-issuer

This reverts commit d1954278a1ba3470b2e5ccae90762078c18d69e9.

Signed-off-by: Mateusz Urbanek <mateusz.urbanek@siderolabs.com>

hack/release.toml

@@ -41,6 +41,7 @@ Talos now runs etcd and kube-apiserver with a minimum TLS version of 1.3, improv
 Custom settings for cipher suites have been removed, as they are ignored when TLS 1.3 is used, which simplifies configuration and ensures the use of modern, secure defaults.
 """
 
+
 [make_deps]
 
     [make_deps.tools]

internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go

@@ -426,7 +426,6 @@ func (ctrl *ControlPlaneStaticPodController) manageAPIServer(ctx context.Context
 		"etcd-keyfile":                     argsbuilder.MergeDenied,
 		"kubelet-client-certificate":       argsbuilder.MergeDenied,
 		"kubelet-client-key":               argsbuilder.MergeDenied,
-		"service-account-issuer":           argsbuilder.MergePrepend,
 		"service-account-key-file":         argsbuilder.MergeDenied,
 		"service-account-signing-key-file": argsbuilder.MergeDenied,
 		"tls-cert-file":                    argsbuilder.MergeDenied,

pkg/argsbuilder/argsbuilder_args.go

@@ -53,18 +53,6 @@ func (a Args) Merge(args Args, setters ...MergeOption) error {
 		case MergeOverwrite:
 			a[key] = slices.Clone(val)
 
-		case MergeAppend:
-			existing := make([]string, 0, len(val)+len(a[key]))
-			existing = append(existing, a[key]...)
-			existing = append(existing, val...)
-			a[key] = existing
-
-		case MergePrepend:
-			existing := make([]string, 0, len(val)+len(a[key]))
-			existing = append(existing, val...)
-			existing = append(existing, a[key]...)
-			a[key] = existing
-
 		case MergeAdditive:
 			// 1. Join the existing []string slice into one string so we can Split it.
 			//    This handles cases where a[key] might be ["a", "b"] or ["a,b"].

pkg/argsbuilder/argsbuilder_interface.go

@@ -14,10 +14,6 @@ const (
 	MergeAdditive
 	// MergeDenied fail merge if another object has the arg defined.
 	MergeDenied
-	// MergePrepend prepends new values before existing ones.
-	MergePrepend
-	// MergeAppend appends new values after existing ones.
-	MergeAppend
 )
 
 // MergePolicies merge policy map.

pkg/argsbuilder/argsbuilder_test.go

@@ -23,10 +23,9 @@ func (suite *ArgsbuilderSuite) TestMergeAdditive() {
 	}
 
 	suite.Require().NoError(
-		args.Merge(
-			argsbuilder.Args{
-				"param": {"value2, value10"},
-			},
+		args.Merge(argsbuilder.Args{
+			"param": {"value2, value10"},
+		},
 			argsbuilder.WithMergePolicies(argsbuilder.MergePolicies{
 				"param": argsbuilder.MergeAdditive,
 			}),
@@ -74,72 +73,6 @@ func (suite *ArgsbuilderSuite) TestMergeOverwrite() {
 	suite.Assert().Equal([]string{"--param=value10", "--param=value11"}, args.Args())
 }
 
-//nolint:dupl
-func (suite *ArgsbuilderSuite) TestMergePrepend() {
-	args := argsbuilder.Args{
-		"param": {"value1"},
-	}
-
-	suite.Require().NoError(
-		args.Merge(argsbuilder.Args{
-			"param": {"value2", "value3"},
-		},
-			argsbuilder.WithMergePolicies(argsbuilder.MergePolicies{
-				"param": argsbuilder.MergePrepend,
-			}),
-		),
-	)
-
-	suite.Require().Equal([]string{"value2", "value3", "value1"}, args["param"])
-	suite.Assert().Equal([]string{"--param=value2", "--param=value3", "--param=value1"}, args.Args())
-
-	suite.Require().NoError(
-		args.Merge(argsbuilder.Args{
-			"param": {"value4"},
-		},
-			argsbuilder.WithMergePolicies(argsbuilder.MergePolicies{
-				"param": argsbuilder.MergePrepend,
-			}),
-		),
-	)
-
-	suite.Require().Equal([]string{"value4", "value2", "value3", "value1"}, args["param"])
-	suite.Assert().Equal([]string{"--param=value4", "--param=value2", "--param=value3", "--param=value1"}, args.Args())
-}
-
-//nolint:dupl
-func (suite *ArgsbuilderSuite) TestMergeAppend() {
-	args := argsbuilder.Args{
-		"param": {"value1"},
-	}
-
-	suite.Require().NoError(
-		args.Merge(argsbuilder.Args{
-			"param": {"value2", "value3"},
-		},
-			argsbuilder.WithMergePolicies(argsbuilder.MergePolicies{
-				"param": argsbuilder.MergeAppend,
-			}),
-		),
-	)
-
-	suite.Require().Equal([]string{"value1", "value2", "value3"}, args["param"])
-	suite.Assert().Equal([]string{"--param=value1", "--param=value2", "--param=value3"}, args.Args())
-
-	suite.Require().NoError(
-		args.Merge(argsbuilder.Args{
-			"param": {"value4"},
-		},
-			argsbuilder.WithMergePolicies(argsbuilder.MergePolicies{
-				"param": argsbuilder.MergeAppend,
-			}),
-		),
-	)
-
-	suite.Require().Equal([]string{"value1", "value2", "value3", "value4"}, args["param"])
-	suite.Assert().Equal([]string{"--param=value1", "--param=value2", "--param=value3", "--param=value4"}, args.Args())
-}
-
 func (suite *ArgsbuilderSuite) TestMergeDenied() {
 	args := argsbuilder.Args{
 		"param": {"value1,value2"},