fix: generate configs without comments/examples

Fixes #196

Signed-off-by: Andrey Smirnov <[email protected]>

Author: smira

controllers/talosconfig_controller.go

@@ -18,6 +18,7 @@ import (
 	"github.com/siderolabs/talos/pkg/machinery/config"
 	"github.com/siderolabs/talos/pkg/machinery/config/configloader"
 	"github.com/siderolabs/talos/pkg/machinery/config/configpatcher"
+	"github.com/siderolabs/talos/pkg/machinery/config/encoder"
 	"github.com/siderolabs/talos/pkg/machinery/config/generate"
 	"github.com/siderolabs/talos/pkg/machinery/config/generate/secrets"
 	"github.com/siderolabs/talos/pkg/machinery/config/machine"
@@ -337,12 +338,15 @@ func (r *TalosConfigReconciler) reconcileGenerate(ctx context.Context, tcScope *
 			return fmt.Errorf("failure applying StrategicPatches: %w", err)
 		}
 
-		outBytes, err := out.Bytes()
+		outCfg, err := out.Config()
 		if err != nil {
 			return fmt.Errorf("failure converting result to bytes: %w", err)
 		}
 
-		retData.BootstrapData = string(outBytes)
+		retData.BootstrapData, err = outCfg.EncodeString(encoder.WithComments(encoder.CommentsDisabled))
+		if err != nil {
+			return fmt.Errorf("failure converting config to string: %w", err)
+		}
 	}
 
 	// Packet acts a fool if you don't prepend #!talos to the userdata
@@ -422,7 +426,7 @@ func (r *TalosConfigReconciler) userConfigs(ctx context.Context, scope *TalosCon
 		}
 	}
 
-	userConfigStr, err := userConfig.EncodeString()
+	userConfigStr, err := userConfig.EncodeString(encoder.WithComments(encoder.CommentsDisabled))
 	if err != nil {
 		return retBundle, err
 	}
@@ -548,7 +552,7 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 		data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = scope.ConfigOwner.GetName()
 	}
 
-	dataOut, err := data.EncodeString()
+	dataOut, err := data.EncodeString(encoder.WithComments(encoder.CommentsDisabled))
 	if err != nil {
 		return retBundle, err
 	}

internal/integration/assertions_test.go

@@ -59,6 +59,8 @@ func assertMachineConfiguration(ctx context.Context, t *testing.T, c client.Clie
 
 	assert.Len(t, bootstrapDataSecret.Data, 1)
 
+	assert.Less(t, len(bootstrapDataSecret.Data["value"]), 32*1024) // 32KB limit on user-data size
+
 	provider, err := configloader.NewFromBytes(bootstrapDataSecret.Data["value"])
 	require.NoError(t, err)
 

internal/integration/integration_test.go

@@ -13,6 +13,7 @@ import (
 
 	bootstrapv1alpha3 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
 	"github.com/siderolabs/talos/pkg/machinery/config"
+	"github.com/siderolabs/talos/pkg/machinery/config/encoder"
 	"github.com/siderolabs/talos/pkg/machinery/config/generate"
 	"github.com/siderolabs/talos/pkg/machinery/config/generate/secrets"
 	talosmachine "github.com/siderolabs/talos/pkg/machinery/config/machine"
@@ -320,12 +321,12 @@ func TestIntegration(t *testing.T) {
 			machineconfig, err := input.Config(talosmachine.TypeWorker)
 			require.NoError(t, err)
 
-			configdata, err := machineconfig.Bytes()
+			configdata, err := machineconfig.EncodeString(encoder.WithComments(encoder.CommentsDisabled))
 			require.NoError(t, err)
 
 			talosConfig := createTalosConfig(ctx, t, c, namespaceName, bootstrapv1alpha3.TalosConfigSpec{
 				GenerateType: "none",
-				Data:         string(configdata),
+				Data:         configdata,
 			})
 			createMachine(ctx, t, c, cluster, talosConfig, true)
 
@@ -344,12 +345,12 @@ func TestIntegration(t *testing.T) {
 			machineconfig, err := input.Config(machineType)
 			require.NoError(t, err)
 
-			configdata, err := machineconfig.Bytes()
+			configdata, err := machineconfig.EncodeString(encoder.WithComments(encoder.CommentsDisabled))
 			require.NoError(t, err)
 
 			talosConfig := createTalosConfig(ctx, t, c, namespaceName, bootstrapv1alpha3.TalosConfigSpec{
 				GenerateType: "none",
-				Data:         string(configdata),
+				Data:         configdata,
 			})
 			createMachine(ctx, t, c, cluster, talosConfig, false)