Merge pull request openshift#7209 from bfournie/pending-user-warning

openshift-merge-robot · web-flow · commit 606b3f9df2e4 · 2023-06-06T02:59:15.000-04:00
OCPBUGS-13108: Log additional host info at warning level
diff --git a/pkg/agent/cluster.go b/pkg/agent/cluster.go
@@ -224,7 +224,7 @@ func (czero *Cluster) IsBootstrapComplete() (bool, bool, error) {
 			(*clusterMetadata.Status == models.ClusterStatusInstallingPendingUserAction) {
 			for _, host := range clusterMetadata.Hosts {
 				if *host.Status == models.ClusterStatusInstallingPendingUserAction {
-					logrus.Debugf("Host %s %s", host.RequestedHostname, *host.StatusInfo)
+					logrus.Warningf("Host %s %s", host.RequestedHostname, *host.StatusInfo)
 				}
 			}
 		}
diff --git a/pkg/agent/waitfor.go b/pkg/agent/waitfor.go
@@ -32,7 +32,6 @@ func WaitForBootstrapComplete(cluster *Cluster) error {
 				lastErrOnExit = err
 				cancel()
 			} else {
-				logrus.Info(err)
 				if err.Error() != lastErrStr {
 					logrus.Info(err)
 					lastErrStr = err.Error()

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func (czero *Cluster) IsBootstrapComplete() (bool, bool, error) {`
`224`	`224`	`(*clusterMetadata.Status == models.ClusterStatusInstallingPendingUserAction) {`
`225`	`225`	`for _, host := range clusterMetadata.Hosts {`
`226`	`226`	`if *host.Status == models.ClusterStatusInstallingPendingUserAction {`
`227`		`- logrus.Debugf("Host %s %s", host.RequestedHostname, *host.StatusInfo)`
	`227`	`+ logrus.Warningf("Host %s %s", host.RequestedHostname, *host.StatusInfo)`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`	`}`