Merge pull request #2195 from vr4manta/SPLAT-2651_rm_ptr

SPLAT-2651: Changed Node struct to not be pointer in CPIConfig

Author: openshift-merge-bot[bot]

pkg/cloudprovider/vsphere/config_test.go

@@ -179,3 +179,48 @@ func TestINIConfigConversion(t *testing.T) {
 		})
 	}
 }
+
+func TestEmptyNodesOmittedInYAML(t *testing.T) {
+	g := gmg.NewWithT(t)
+
+	// Create a config with an empty Nodes struct
+	config := &CPIConfig{
+		CommonConfig: CommonConfig{
+			Global: Global{
+				User:     "testuser",
+				Password: "testpass",
+			},
+		},
+		Nodes: Nodes{}, // Empty struct, should be omitted
+	}
+
+	yamlOutput, err := MarshalConfig(config)
+	g.Expect(err).ToNot(gmg.HaveOccurred())
+
+	// Verify that "nodes:" does not appear in the output
+	g.Expect(yamlOutput).ToNot(gmg.ContainSubstring("nodes:"))
+}
+
+func TestNodesWithValuesIncludedInYAML(t *testing.T) {
+	g := gmg.NewWithT(t)
+
+	// Create a config with a populated Nodes struct
+	config := &CPIConfig{
+		CommonConfig: CommonConfig{
+			Global: Global{
+				User:     "testuser",
+				Password: "testpass",
+			},
+		},
+		Nodes: Nodes{
+			InternalNetworkSubnetCIDR: "192.168.1.0/24",
+		},
+	}
+
+	yamlOutput, err := MarshalConfig(config)
+	g.Expect(err).ToNot(gmg.HaveOccurred())
+
+	// Verify that "nodes:" DOES appear when the struct has values
+	g.Expect(yamlOutput).To(gmg.ContainSubstring("nodes:"))
+	g.Expect(yamlOutput).To(gmg.ContainSubstring("internalNetworkSubnetCidr: 192.168.1.0/24"))
+}

pkg/cloudprovider/vsphere/ini.go

@@ -219,7 +219,7 @@ func (iniConfig *cpiConfigINI) createConfig() (*CPIConfig, error) {
 		iniConfig.Nodes.ExternalVMNetworkName != "" ||
 		iniConfig.Nodes.ExcludeInternalNetworkSubnetCIDR != "" ||
 		iniConfig.Nodes.ExcludeExternalNetworkSubnetCIDR != "" {
-		cfg.Nodes = &Nodes{
+		cfg.Nodes = Nodes{
 			InternalNetworkSubnetCIDR:        iniConfig.Nodes.InternalNetworkSubnetCIDR,
 			ExternalNetworkSubnetCIDR:        iniConfig.Nodes.ExternalNetworkSubnetCIDR,
 			InternalVMNetworkName:            iniConfig.Nodes.InternalVMNetworkName,

pkg/cloudprovider/vsphere/yaml.go

@@ -140,7 +140,7 @@ type Nodes struct {
 // CPIConfig is the YAML representation of vsphere-cloud-provider config
 type CPIConfig struct {
 	CommonConfig `json:",inline"`
-	Nodes        *Nodes `json:"nodes,omitempty"`
+	Nodes        Nodes `json:"nodes,omitzero"`
 }
 
 // readCPIConfigYAML parses vSphere cloud config file and stores it into CPIConfig