skip (temporary) NMStateConfig manifest generation

Author: andfasano

pkg/asset/agent/joiner/clusterinfo.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"net/url"
 
-	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

pkg/asset/agent/manifests/nmstateconfig.go

@@ -21,7 +21,9 @@ import (
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent"
 	"github.com/openshift/installer/pkg/asset/agent/agentconfig"
+	"github.com/openshift/installer/pkg/asset/agent/joiner"
 	"github.com/openshift/installer/pkg/asset/agent/manifests/staticnetworkconfig"
+	"github.com/openshift/installer/pkg/asset/agent/workflow"
 	"github.com/openshift/installer/pkg/types"
 	agenttype "github.com/openshift/installer/pkg/types/agent"
 )
@@ -63,17 +65,26 @@ func (*NMStateConfig) Name() string {
 // the asset.
 func (*NMStateConfig) Dependencies() []asset.Asset {
 	return []asset.Asset{
+		&workflow.AgentWorkflow{},
+		&joiner.ClusterInfo{},
 		&agentconfig.AgentHosts{},
 		&agent.OptionalInstallConfig{},
 	}
 }
 
 // Generate generates the NMStateConfig manifest.
 func (n *NMStateConfig) Generate(dependencies asset.Parents) error {
-
+	agentWorkflow := &workflow.AgentWorkflow{}
+	clusterInfo := &joiner.ClusterInfo{}
 	agentHosts := &agentconfig.AgentHosts{}
 	installConfig := &agent.OptionalInstallConfig{}
-	dependencies.Get(agentHosts, installConfig)
+	dependencies.Get(agentHosts, installConfig, agentWorkflow, clusterInfo)
+
+	// Temporary skip in case of add nodes workflow. Main input for this
+	// asset will be retrieved from the nodes-config.yaml asset
+	if agentWorkflow.Workflow == workflow.AgentWorkflowTypeAddNodes {
+		return nil
+	}
 
 	staticNetworkConfig := []*models.HostStaticNetworkConfig{}
 	nmStateConfigs := []*aiv1beta1.NMStateConfig{}

pkg/asset/agent/manifests/nmstateconfig_test.go

@@ -14,6 +14,8 @@ import (
 	aiv1beta1 "github.com/openshift/assisted-service/api/v1beta1"
 	"github.com/openshift/assisted-service/models"
 	"github.com/openshift/installer/pkg/asset"
+	"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/types/agent"
 )
@@ -29,6 +31,8 @@ func TestNMStateConfig_Generate(t *testing.T) {
 		{
 			name: "agentHosts does not contain networkConfig",
 			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeInstall},
+				&joiner.ClusterInfo{},
 				getAgentHostsNoHosts(),
 				getValidOptionalInstallConfig(),
 			},
@@ -39,6 +43,8 @@ func TestNMStateConfig_Generate(t *testing.T) {
 		{
 			name: "agentHosts with some hosts without networkconfig",
 			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeInstall},
+				&joiner.ClusterInfo{},
 				getAgentHostsWithSomeHostsWithoutNetworkConfig(),
 				getValidOptionalInstallConfig(),
 			},
@@ -72,6 +78,8 @@ func TestNMStateConfig_Generate(t *testing.T) {
 		{
 			name: "valid config",
 			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeInstall},
+				&joiner.ClusterInfo{},
 				getValidAgentHostsConfig(),
 				getValidOptionalInstallConfig(),
 			},
@@ -153,6 +161,8 @@ func TestNMStateConfig_Generate(t *testing.T) {
 		{
 			name: "invalid networkConfig",
 			dependencies: []asset.Asset{
+				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeInstall},
+				&joiner.ClusterInfo{},
 				getInValidAgentHostsConfig(),
 				getValidOptionalInstallConfig(),
 			},