inject ClusterInfo into ClusterImageSet asset

Author: andfasano

pkg/asset/agent/joiner/clusterinfo.go

@@ -22,6 +22,8 @@ import (
 // are inspected to extract the required configuration
 type ClusterInfo struct {
 	ClusterID    string
+	Version      string
+	ReleaseImage string
 	APIDNSName   string
 	PullSecret   string
 	Namespace    string
@@ -69,7 +71,7 @@ func (ci *ClusterInfo) Generate(dependencies asset.Parents) error {
 	if err != nil {
 		return err
 	}
-	err = ci.retrieveClusterID(clientset)
+	err = ci.retrieveClusterData(clientset)
 	if err != nil {
 		return err
 	}
@@ -113,12 +115,14 @@ func (ci *ClusterInfo) getRestConfig(kubeconfig string) (*rest.Config, error) {
 	return config, err
 }
 
-func (ci *ClusterInfo) retrieveClusterID(clientset *configclient.Clientset) error {
+func (ci *ClusterInfo) retrieveClusterData(clientset *configclient.Clientset) error {
 	cv, err := clientset.ConfigV1().ClusterVersions().Get(context.Background(), "version", metav1.GetOptions{})
 	if err != nil {
 		return err
 	}
 	ci.ClusterID = string(cv.Spec.ClusterID)
+	ci.ReleaseImage = cv.Status.History[0].Image
+	ci.Version = cv.Status.History[0].Version
 
 	return nil
 }

pkg/asset/agent/manifests/clusterimageset.go

@@ -13,6 +13,8 @@ import (
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent"
+	"github.com/openshift/installer/pkg/asset/agent/joiner"
+	"github.com/openshift/installer/pkg/asset/agent/workflow"
 	"github.com/openshift/installer/pkg/asset/releaseimage"
 	"github.com/openshift/installer/pkg/version"
 )
@@ -38,50 +40,69 @@ func (*ClusterImageSet) Name() string {
 // the asset.
 func (*ClusterImageSet) Dependencies() []asset.Asset {
 	return []asset.Asset{
+		&workflow.AgentWorkflow{},
+		&joiner.ClusterInfo{},
 		&releaseimage.Image{},
 		&agent.OptionalInstallConfig{},
 	}
 }
 
 // Generate generates the ClusterImageSet manifest.
 func (a *ClusterImageSet) Generate(dependencies asset.Parents) error {
-
+	agentWorkflow := &workflow.AgentWorkflow{}
+	clusterInfo := &joiner.ClusterInfo{}
 	releaseImage := &releaseimage.Image{}
 	installConfig := &agent.OptionalInstallConfig{}
-	dependencies.Get(releaseImage, installConfig)
+	dependencies.Get(releaseImage, installConfig, agentWorkflow, clusterInfo)
 
-	currentVersion, err := version.Version()
-	if err != nil {
-		return err
+	switch agentWorkflow.Workflow {
+	case workflow.AgentWorkflowTypeInstall:
+		currentVersion, err := version.Version()
+		if err != nil {
+			return err
+		}
+
+		clusterNamespace := ""
+		if installConfig.Config != nil {
+			clusterNamespace = installConfig.ClusterNamespace()
+		}
+		err = a.generateManifest(currentVersion, releaseImage.PullSpec, clusterNamespace)
+		if err != nil {
+			return err
+		}
+	case workflow.AgentWorkflowTypeAddNodes:
+		return a.generateManifest(clusterInfo.Version, clusterInfo.ReleaseImage, clusterInfo.Namespace)
+
+	default:
+		return fmt.Errorf("AgentWorkflowType value not supported: %s", agentWorkflow.Workflow)
 	}
 
+	return a.finish(agentWorkflow.Workflow)
+}
+
+func (a *ClusterImageSet) generateManifest(version, releaseImage, clusterNamespace string) error {
 	clusterImageSet := &hivev1.ClusterImageSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: fmt.Sprintf("openshift-%s", currentVersion),
+			Name:      fmt.Sprintf("openshift-%s", version),
+			Namespace: clusterNamespace,
 		},
 		Spec: hivev1.ClusterImageSetSpec{
-			ReleaseImage: releaseImage.PullSpec,
+			ReleaseImage: releaseImage,
 		},
 	}
 
-	if installConfig.Config != nil {
-		clusterImageSet.ObjectMeta.Namespace = installConfig.ClusterNamespace()
-
-	}
-
-	a.Config = clusterImageSet
-
 	configData, err := yaml.Marshal(clusterImageSet)
 	if err != nil {
 		return errors.Wrap(err, "failed to marshal agent cluster image set")
 	}
 
+	a.Config = clusterImageSet
 	a.File = &asset.File{
 		Filename: clusterImageSetFilename,
 		Data:     configData,
 	}
 
-	return a.finish()
+	return nil
 }
 
 // Files returns the files generated by the asset.
@@ -95,6 +116,12 @@ func (a *ClusterImageSet) Files() []*asset.File {
 // Load returns ClusterImageSet asset from the disk.
 func (a *ClusterImageSet) Load(f asset.FileFetcher) (bool, error) {
 
+	agentWorkflow := &workflow.AgentWorkflow{}
+	_, err := agentWorkflow.Load(f)
+	if err != nil {
+		return false, err
+	}
+
 	clusterImageSetFile, err := f.FetchByName(clusterImageSetFilename)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -112,36 +139,41 @@ func (a *ClusterImageSet) Load(f asset.FileFetcher) (bool, error) {
 	}
 	a.Config = clusterImageSet
 
-	if err = a.finish(); err != nil {
+	if err = a.finish(agentWorkflow.Workflow); err != nil {
 		return false, err
 	}
 	return true, nil
 }
 
-func (a *ClusterImageSet) finish() error {
+func (a *ClusterImageSet) finish(workflowType workflow.AgentWorkflowType) error {
 
 	if a.Config == nil {
 		return errors.New("missing configuration or manifest file")
 	}
 
-	if err := a.validateClusterImageSet().ToAggregate(); err != nil {
+	if err := a.validateClusterImageSet(workflowType).ToAggregate(); err != nil {
 		return errors.Wrapf(err, "invalid ClusterImageSet configuration")
 	}
 
 	return nil
 }
 
-func (a *ClusterImageSet) validateClusterImageSet() field.ErrorList {
+func (a *ClusterImageSet) validateClusterImageSet(workflowType workflow.AgentWorkflowType) field.ErrorList {
 	allErrs := field.ErrorList{}
 
-	if err := a.validateReleaseVersion(); err != nil {
+	if err := a.validateReleaseVersion(workflowType); err != nil {
 		allErrs = append(allErrs, err...)
 	}
 
 	return allErrs
 }
 
-func (a *ClusterImageSet) validateReleaseVersion() field.ErrorList {
+func (a *ClusterImageSet) validateReleaseVersion(workflowType workflow.AgentWorkflowType) field.ErrorList {
+
+	// skip release version check in case of add nodes workflow
+	if workflowType == workflow.AgentWorkflowTypeAddNodes {
+		return nil
+	}
 
 	var allErrs field.ErrorList
 

pkg/asset/agent/manifests/clusterimageset_test.go

@@ -14,6 +14,8 @@ import (
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent"
+	"github.com/openshift/installer/pkg/asset/agent/joiner"
+	"github.com/openshift/installer/pkg/asset/agent/workflow"
 	"github.com/openshift/installer/pkg/asset/mock"
 	"github.com/openshift/installer/pkg/asset/releaseimage"
 )
@@ -31,6 +33,8 @@ func TestClusterImageSet_Generate(t *testing.T) {
 		{
 			name: "missing install config should still generate a ClusterImageSet with empty namespace",
 			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeInstall},
+				&joiner.ClusterInfo{},
 				&agent.OptionalInstallConfig{},
 				&releaseimage.Image{
 					PullSpec: currentRelease,
@@ -48,6 +52,8 @@ func TestClusterImageSet_Generate(t *testing.T) {
 		{
 			name: "invalid ClusterImageSet configuration",
 			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeInstall},
+				&joiner.ClusterInfo{},
 				getValidOptionalInstallConfig(),
 				&releaseimage.Image{},
 			},
@@ -56,6 +62,8 @@ func TestClusterImageSet_Generate(t *testing.T) {
 		{
 			name: "valid configuration",
 			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeInstall},
+				&joiner.ClusterInfo{},
 				getValidOptionalInstallConfig(),
 				&releaseimage.Image{
 					PullSpec: currentRelease,
@@ -71,6 +79,28 @@ func TestClusterImageSet_Generate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "add-nodes command",
+			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeAddNodes},
+				&joiner.ClusterInfo{
+					Version:      "4.16.0",
+					ReleaseImage: "registry.ci.openshift.org/ocp/release@sha256:foo",
+					Namespace:    "agent-cluster",
+				},
+				&agent.OptionalInstallConfig{},
+				&releaseimage.Image{},
+			},
+			expectedConfig: &hivev1.ClusterImageSet{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "openshift-4.16.0",
+					Namespace: "agent-cluster",
+				},
+				Spec: hivev1.ClusterImageSetSpec{
+					ReleaseImage: "registry.ci.openshift.org/ocp/release@sha256:foo",
+				},
+			},
+		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -185,6 +215,13 @@ spec:
 						Data:     []byte(tc.data)},
 					tc.fetchError,
 				)
+			fileFetcher.EXPECT().FetchByName(".agentworkflow").
+				Return(
+					&asset.File{
+						Filename: ".agentworkflow",
+						Data:     []byte("install")},
+					nil,
+				)
 
 			asset := &ClusterImageSet{}
 			found, err := asset.Load(fileFetcher)