NO-ISSUE Log assisted controller configuration (#235)

openshift · Mar 15, 2021 · 2b18948 · 2b18948
1 parent 27a24a3
commit 2b18948
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/assisted_installer_controller/assisted_installer_controller.go b/src/assisted_installer_controller/assisted_installer_controller.go
@@ -260,10 +260,13 @@ func (c controller) postInstallConfigs() error {
 	var err error
 
 	if c.WaitForClusterVersion {
+		c.log.Infof("Waiting for cluster version operator")
 		err = c.waitingForClusterVersion()
 		if err != nil {
 			return err
 		}
+	} else {
+		c.log.Infof("Skipping waiting for cluster version operator")
 	}
 
 	err = utils.WaitForPredicate(WaitTimeout, GeneralWaitInterval, c.addRouterCAToClusterCA)

diff --git a/src/main/assisted-installer-controller/assisted_installer_main.go b/src/main/assisted-installer-controller/assisted_installer_main.go
@@ -13,6 +13,7 @@ import (
 	assistedinstallercontroller "github.com/openshift/assisted-installer/src/assisted_installer_controller"
 	"github.com/openshift/assisted-installer/src/inventory_client"
 	"github.com/openshift/assisted-installer/src/ops"
+	"github.com/openshift/assisted-service/pkg/secretdump"
 	"github.com/sirupsen/logrus"
 )
 
@@ -28,14 +29,13 @@ func main() {
 		log.Fatal(err.Error())
 	}
 
+	logger.Infof("Start running Assisted-Controller. Configuration is:\n %s", secretdump.DumpSecretStruct(Options.ControllerConfig))
+
 	kc, err := k8s_client.NewK8SClient("", logger)
 	if err != nil {
 		log.Fatalf("Failed to create k8 client %v", err)
 	}
 
-	logger.Infof("Start running assisted-controller with cluster-id %s, url %s",
-		Options.ControllerConfig.ClusterID, Options.ControllerConfig.URL)
-
 	err = kc.SetProxyEnvVars()
 	if err != nil {
 		log.Fatalf("Failed to set env vars for installer-controller pod %v", err)