load nodes-config.yaml in the AddNodesConfig asset

Author: andfasano

pkg/asset/agent/joiner/addnodesconfig.go

@@ -6,18 +6,36 @@ import (
 	"os"
 	"path/filepath"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+	"sigs.k8s.io/yaml"
+
 	"github.com/openshift/installer/pkg/asset"
+	"github.com/openshift/installer/pkg/types/agent"
+	"github.com/pkg/errors"
 )
 
 const (
-	addNodesParamsFile = ".addnodesparams"
+	addNodesParamsFile  = ".addnodesparams"
+	nodesConfigFilename = "nodes-config.yaml"
 )
 
 // AddNodesConfig is used to store the current configuration
 // for the command.
 type AddNodesConfig struct {
-	File   *asset.File
 	Params Params
+	Config Config
+}
+
+var _ asset.WritableAsset = (*AddNodesConfig)(nil)
+
+// Config defines the configuration for the nodes-config.yaml file
+// used by the add-nodes command.
+type Config struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Hosts []agent.Host `json:"hosts,omitempty"`
 }
 
 // Params is used to store the command line parameters.
@@ -53,15 +71,13 @@ func (*AddNodesConfig) Generate(dependencies asset.Parents) error {
 }
 
 // Files returns the files generated by the asset.
-func (a *AddNodesConfig) Files() []*asset.File {
-	if a.File != nil {
-		return []*asset.File{a.File}
-	}
+func (*AddNodesConfig) Files() []*asset.File {
 	return []*asset.File{}
 }
 
 // Load returns agent config asset from the disk.
 func (a *AddNodesConfig) Load(f asset.FileFetcher) (bool, error) {
+	// Load params file.
 	file, err := f.FetchByName(addNodesParamsFile)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -71,10 +87,44 @@ func (a *AddNodesConfig) Load(f asset.FileFetcher) (bool, error) {
 	}
 
 	params := &Params{}
-	if err := json.Unmarshal(file.Data, params); err != nil {
+	if err = json.Unmarshal(file.Data, params); err != nil {
 		return false, fmt.Errorf("failed to unmarshal %s: %w", addNodesParamsFile, err)
 	}
-
 	a.Params = *params
+
+	// Load nodes-config.yaml file.
+	file, err = f.FetchByName(nodesConfigFilename)
+	if err != nil {
+		return false, fmt.Errorf("failed to load %s file: %w", nodesConfigFilename, err)
+	}
+
+	config := Config{}
+	if err = yaml.Unmarshal(file.Data, &config); err != nil {
+		return false, fmt.Errorf("failed to unmarshal %s: %w", nodesConfigFilename, err)
+	}
+	a.Config = config
+
+	err = a.finish()
+	if err != nil {
+		return false, err
+	}
 	return true, nil
 }
+
+func (a *AddNodesConfig) finish() error {
+	if err := a.validateHosts().ToAggregate(); err != nil {
+		return errors.Wrapf(err, "invalid nodes configuration")
+	}
+	return nil
+}
+
+func (a *AddNodesConfig) validateHosts() field.ErrorList {
+	var allErrs field.ErrorList
+
+	if len(a.Config.Hosts) == 0 {
+		fieldPath := field.NewPath("hosts")
+		allErrs = append(allErrs, field.Required(fieldPath, "at least one host must be defined"))
+	}
+
+	return allErrs
+}

pkg/asset/agent/joiner/addnodesconfig_test.go

@@ -0,0 +1,66 @@
+package joiner
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"github.com/openshift/installer/pkg/asset"
+	"github.com/openshift/installer/pkg/asset/mock"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAddNodesConfig_Load(t *testing.T) {
+	cases := []struct {
+		name               string
+		addNodesParamsData string
+		nodesConfigData    string
+		expectedError      string
+	}{
+		{
+			name: "default",
+			nodesConfigData: `hosts:
+- hostname: master-0
+  interfaces:
+  - name: eth0
+    macAddress: 00:ef:29:72:b9:771`,
+		},
+		{
+			name:          "empty nodes-config.yaml",
+			expectedError: "invalid nodes configuration: hosts: Required value: at least one host must be defined",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			mockCtrl := gomock.NewController(t)
+			defer mockCtrl.Finish()
+
+			if tc.addNodesParamsData == "" {
+				tc.addNodesParamsData = "{}"
+			}
+
+			fileFetcher := mock.NewMockFileFetcher(mockCtrl)
+			fileFetcher.EXPECT().FetchByName(addNodesParamsFile).
+				Return(
+					&asset.File{
+						Filename: addNodesParamsFile,
+						Data:     []byte(tc.addNodesParamsData)},
+					nil,
+				)
+			fileFetcher.EXPECT().FetchByName(nodesConfigFilename).
+				Return(
+					&asset.File{
+						Filename: nodesConfigFilename,
+						Data:     []byte(tc.nodesConfigData)},
+					nil,
+				)
+
+			addNodesConfig := &AddNodesConfig{}
+			_, err := addNodesConfig.Load(fileFetcher)
+			if tc.expectedError != "" {
+				assert.Equal(t, tc.expectedError, err.Error())
+			} else {
+				assert.NoError(t, err)
+			}
+		})
+	}
+}