Deduplicate k0s args for control plane (#1127)

Signed-off-by: Alexey Makhov <[email protected]>
Signed-off-by: makhov <[email protected]>

Author: makhov

internal/controller/controlplane/helper.go

@@ -605,15 +605,18 @@ func normalizeK0sConfigSpec(kcp *cpv1beta1.K0sControlPlane, bootstrapConfig boot
 	}
 
 	// Remove duplicated values generated bootstrap controller in order to compared it with kcp.
+	bootstrapConfig.Spec.K0sConfigSpec.Args = uniqueArgs(kcp.Spec.K0sConfigSpec.Args)
+}
+
+func uniqueArgs(args []string) []string {
 	uniqueArgsSlice := []string{}
 	uniqueArgsMap := make(map[string]struct{})
-	for _, arg := range bootstrapConfig.Spec.K0sConfigSpec.Args {
+	for _, arg := range args {
 		if _, exists := uniqueArgsMap[arg]; !exists {
 			uniqueArgsSlice = append(uniqueArgsSlice, arg)
 			uniqueArgsMap[arg] = struct{}{}
 		}
 	}
-	if len(uniqueArgsSlice) > 0 {
-		bootstrapConfig.Spec.K0sConfigSpec.Args = uniqueArgsSlice
-	}
+
+	return uniqueArgsSlice
 }

internal/controller/controlplane/k0s_controlplane_controller.go

@@ -588,6 +588,9 @@ func (c *K0sController) deleteK0sNodeResources(ctx context.Context, cluster *clu
 }
 
 func (c *K0sController) createBootstrapConfig(ctx context.Context, name string, _ *clusterv1.Cluster, kcp *cpv1beta1.K0sControlPlane, machine *clusterv1.Machine, clusterName string) error {
+
+	kcp.Spec.K0sConfigSpec.Args = uniqueArgs(kcp.Spec.K0sConfigSpec.Args)
+
 	controllerConfig := bootstrapv1.K0sControllerConfig{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1",