WIP

openstack-k8s-operators · Jun 18, 2024 · 772ade5 · 772ade5
1 parent 441044e
commit 772ade5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/api/v1beta1/octavia_webhook.go b/api/v1beta1/octavia_webhook.go
@@ -47,7 +47,7 @@ var octavialog = logf.Log.WithName("octavia-resource")
 // SetupOctaviaDefaults - initialize Octavia spec defaults for use with either internal or external webhooks
 func SetupOctaviaDefaults(defaults OctaviaDefaults) {
 	octaviaDefaults = defaults
-	octavialog.Info("Octavia defaults initialized", "defaults", defaults)
+	octavialog.V(1).Info("Octavia defaults initialized", "defaults", defaults)
 }
 
 // SetupWebhookWithManager sets up the webhook with the Manager
@@ -63,7 +63,7 @@ var _ webhook.Defaulter = &Octavia{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *Octavia) Default() {
-	octavialog.Info("default", "name", r.Name)
+	octavialog.V(1).Info("default", "name", r.Name)
 
 	r.Spec.Default()
 }
@@ -99,7 +99,7 @@ var _ webhook.Validator = &Octavia{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *Octavia) ValidateCreate() (admission.Warnings, error) {
-	octavialog.Info("validate create", "name", r.Name)
+	octavialog.V(1).Info("validate create", "name", r.Name)
 
 	var allErrs field.ErrorList
 	basePath := field.NewPath("spec")
@@ -142,7 +142,7 @@ func (r *OctaviaSpecCore) ValidateCreate(basePath *field.Path) field.ErrorList {
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
 func (r *Octavia) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
-	octavialog.Info("validate update", "name", r.Name)
+	octavialog.V(1).Info("validate update", "name", r.Name)
 
 	oldOctavia, ok := old.(*Octavia)
 	if !ok || oldOctavia == nil {

diff --git a/controllers/amphoracontroller_controller.go b/controllers/amphoracontroller_controller.go
@@ -304,7 +304,7 @@ func (r *OctaviaAmphoraControllerReconciler) reconcileNormal(ctx context.Context
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	r.Log.Info(fmt.Sprintf("Using default flavor \"%s\"", defaultFlavorID))
+	r.Log.V(1).Info(fmt.Sprintf("Using default flavor \"%s\"", defaultFlavorID))
 
 	templateVars := OctaviaTemplateVars{
 		LbMgmtNetworkID:        instance.Spec.LbMgmtNetworkID,
@@ -457,11 +457,11 @@ func (r *OctaviaAmphoraControllerReconciler) reconcileNormal(ctx context.Context
 	// We reached the end of the Reconcile, update the Ready condition based on
 	// the sub conditions
 	if instance.Status.Conditions.AllSubConditionIsTrue() {
-		Log.V(1).Info("Setting Ready condition to true.")
+		Log.Info("Amphora controller is now ready.")
 		instance.Status.Conditions.MarkTrue(
 			condition.ReadyCondition, condition.ReadyMessage)
 	} else {
-		Log.Info("Not all conditions are ready for Amphora controller")
+		Log.V(1).Info("Not all conditions are ready for Amphora controller yet")
 	}
 	return ctrl.Result{}, nil
 }

diff --git a/controllers/octavia_controller.go b/controllers/octavia_controller.go
@@ -299,7 +299,7 @@ func (r *OctaviaReconciler) reconcileInit(
 	serviceAnnotations map[string]string,
 ) (ctrl.Result, error) {
 	Log := r.GetLogger(ctx)
-	Log.V(1).Info("Reconciling Service init")
+	Log.Info("Reconciling Service init")
 
 	// ConfigMap
 	configMapVars := make(map[string]env.Setter)
@@ -939,7 +939,7 @@ func (r *OctaviaReconciler) reconcileNormal(ctx context.Context, instance *octav
 		instance.Status.Conditions.MarkTrue(
 			condition.ReadyCondition, condition.ReadyMessage)
 	}
-	Log.V(1).Info("Reconciled Service successfully")
+	Log.Info("Reconciled Service successfully")
 	return ctrl.Result{}, nil
 }
 

diff --git a/main.go b/main.go
@@ -82,7 +82,7 @@ func main() {
 		Development: true,
 		TimeEncoder: zapcore.ISO8601TimeEncoder,
 		// Set level to 0 in order to hide all debug logs
-		// Level: zapcore.Level(0),
+		Level: zapcore.Level(0),
 	}
 	opts.BindFlags(flag.CommandLine)
 	flag.Parse()