Fix bootstrap config conversion (#122)

* fix bootstrap config conversion

* set defaults for testing

src/k8s/api/v1/types.go

@@ -10,9 +10,9 @@ import (
 
 type BootstrapConfig struct {
 	// Components are the components that should be enabled on bootstrap.
-	Components []string
+	Components []string `yaml:"components"`
 	// ClusterCIDR is the CIDR of the cluster.
-	ClusterCIDR string
+	ClusterCIDR string `yaml:"cluster-cidr"`
 }
 
 // SetDefaults sets the fields to default values.
@@ -23,16 +23,13 @@ func (b *BootstrapConfig) SetDefaults() {
 
 // ToMap marshals the BootstrapConfig into yaml and map it to "bootstrapConfig".
 func (b *BootstrapConfig) ToMap() (map[string]string, error) {
-	config := map[string]any{
-		"components":   b.Components,
-		"cluster-cidr": b.ClusterCIDR,
-	}
-	c, err := yaml.Marshal(config)
+	config, err := yaml.Marshal(b)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal config map: %w", err)
 	}
+
 	return map[string]string{
-		"bootstrapConfig": string(c),
+		"bootstrapConfig": string(config),
 	}, nil
 }
 

src/k8s/api/v1/types_test.go

@@ -0,0 +1,29 @@
+package v1
+
+import (
+	"testing"
+
+	. "github.com/onsi/gomega"
+)
+
+func TestBootstrapConfigFromMap(t *testing.T) {
+	g := NewWithT(t)
+	// Create a new BootstrapConfig with default values
+	bc := &BootstrapConfig{
+		Components:  []string{"dns", "network", "storage"},
+		ClusterCIDR: "10.1.0.0/16",
+	}
+
+	// Convert the BootstrapConfig to a map
+	m, err := bc.ToMap()
+	g.Expect(err).To(BeNil())
+
+	// Unmarshal the YAML string from the map into a new BootstrapConfig instance
+	bcyaml, err := BootstrapConfigFromMap(m)
+
+	// Check for errors
+	g.Expect(err).To(BeNil())
+	// Compare the unmarshaled BootstrapConfig with the original one
+	g.Expect(bcyaml).To(Equal(bc)) // Note the *bc here to compare values, not pointers
+
+}