Merge pull request #6788 from openshift-cherrypick-robot/cherry-pick-…

…6740-to-release-4.12

[release-4.12] OCPBUGS-6087: Warn if agent assets detected when using non-agent waitfor

cmd/openshift-install/create.go

@@ -28,6 +28,7 @@ import (
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	routeclient "github.com/openshift/client-go/route/clientset/versioned"
 	"github.com/openshift/installer/pkg/asset"
+	"github.com/openshift/installer/pkg/asset/agent/agentconfig"
 	"github.com/openshift/installer/pkg/asset/cluster"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/logging"
@@ -377,6 +378,11 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config) *cluster
 	silenceRemaining := logDownsample
 	previousErrorSuffix := ""
 	timer.StartTimer("API")
+
+	if assetStore, err := assetstore.NewStore(rootOpts.dir); err == nil {
+		checkIfAgentCommand(assetStore)
+	}
+
 	var lastErr error
 	wait.Until(func() {
 		version, err := discovery.ServerVersion()
@@ -476,6 +482,8 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config) error {
 				timeout = 60 * time.Minute
 			}
 		}
+
+		checkIfAgentCommand(assetStore)
 	}
 
 	untilTime := time.Now().Add(timeout)
@@ -639,3 +647,9 @@ The cluster should be accessible for troubleshooting as detailed in the document
 https://docs.openshift.com/container-platform/latest/support/troubleshooting/troubleshooting-installations.html
 The 'wait-for install-complete' subcommand can then be used to continue the installation`)
 }
+
+func checkIfAgentCommand(assetStore asset.Store) {
+	if agentConfig, err := assetStore.Load(&agentconfig.AgentConfig{}); err == nil && agentConfig != nil {
+		logrus.Warning("An agent configuration was detected but this command is not the agent wait-for command")
+	}
+}