From 6713bc183d82a641f411288beb59bcc1bf204af2 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Sun, 19 Oct 2025 20:22:00 -0400 Subject: [PATCH] fix(config): Don't wrote node values to windsor.yaml Node values should not be written to the `windsor.yaml` file as they are generated values, not defaults. Signed-off-by: Ryan VanGundy --- api/v1alpha1/cluster/cluster_config.go | 2 +- api/v1alpha1/cluster/cluster_config_test.go | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/v1alpha1/cluster/cluster_config.go b/api/v1alpha1/cluster/cluster_config.go index 7070af071..cf6b40ee7 100644 --- a/api/v1alpha1/cluster/cluster_config.go +++ b/api/v1alpha1/cluster/cluster_config.go @@ -25,7 +25,7 @@ type NodeGroupConfig struct { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` } diff --git a/api/v1alpha1/cluster/cluster_config_test.go b/api/v1alpha1/cluster/cluster_config_test.go index 5acd36d02..0a5a8d213 100644 --- a/api/v1alpha1/cluster/cluster_config_test.go +++ b/api/v1alpha1/cluster/cluster_config_test.go @@ -29,7 +29,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -51,7 +51,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -80,7 +80,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -102,7 +102,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -193,7 +193,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -210,7 +210,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -234,7 +234,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -251,7 +251,7 @@ func TestClusterConfig_Merge(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -333,7 +333,7 @@ func TestClusterConfig_Copy(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{ @@ -355,7 +355,7 @@ func TestClusterConfig_Copy(t *testing.T) { CPU *int `yaml:"cpu,omitempty"` Memory *int `yaml:"memory,omitempty"` Image *string `yaml:"image,omitempty"` - Nodes map[string]NodeConfig `yaml:"nodes,omitempty"` + Nodes map[string]NodeConfig `yaml:"-"` HostPorts []string `yaml:"hostports,omitempty"` Volumes []string `yaml:"volumes,omitempty"` }{