AGENT-910: node-joiner multi-arch support

Allow the CPU architecture to be specified in nodes-config.yaml.

Author: rwsu

pkg/asset/agent/joiner/addnodesconfig.go

@@ -35,7 +35,8 @@ type Config struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Hosts []agent.Host `json:"hosts,omitempty"`
+	CPUArchitecture string       `json:"cpuArchitecture,omitempty"`
+	Hosts           []agent.Host `json:"hosts,omitempty"`
 }
 
 // Params is used to store the command line parameters.

pkg/asset/agent/joiner/clusterinfo.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/coreos/stream-metadata-go/arch"
 	"github.com/coreos/stream-metadata-go/stream"
+	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -94,10 +95,12 @@ func (ci *ClusterInfo) Generate(dependencies asset.Parents) error {
 	if err != nil {
 		return err
 	}
-	err = ci.retrieveArchitecture()
+
+	err = ci.retrieveArchitecture(addNodesConfig)
 	if err != nil {
 		return err
 	}
+
 	err = ci.retrieveInstallConfigData()
 	if err != nil {
 		return err
@@ -192,14 +195,19 @@ func (ci *ClusterInfo) retrieveUserTrustBundle() error {
 	return nil
 }
 
-func (ci *ClusterInfo) retrieveArchitecture() error {
-	nodes, err := ci.Client.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
-		LabelSelector: "node-role.kubernetes.io/master",
-	})
-	if err != nil {
-		return err
+func (ci *ClusterInfo) retrieveArchitecture(addNodesConfig *AddNodesConfig) error {
+	if addNodesConfig.Config.CPUArchitecture != "" {
+		logrus.Infof("CPU architecture set to: %v", addNodesConfig.Config.CPUArchitecture)
+		ci.Architecture = addNodesConfig.Config.CPUArchitecture
+	} else {
+		nodes, err := ci.Client.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
+			LabelSelector: "node-role.kubernetes.io/master",
+		})
+		if err != nil {
+			return err
+		}
+		ci.Architecture = nodes.Items[0].Status.NodeInfo.Architecture
 	}
-	ci.Architecture = nodes.Items[0].Status.NodeInfo.Architecture
 
 	return nil
 }