demote high-frequency Info logs to Debug on tektonaddon TaskImages

Author: jkhelil

pkg/reconciler/common/transformers.go

@@ -18,14 +18,14 @@ package common
 
 import (
 	"context"
-	"log"
 	"os"
 	"reflect"
 	"strconv"
 	"strings"
 
 	mf "github.com/manifestival/manifestival"
 	"github.com/tektoncd/operator/pkg/apis/operator/v1alpha1"
+	"go.uber.org/zap"
 	"golang.org/x/exp/slices"
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
@@ -308,7 +308,8 @@ func SplitsByEqual(arg string) ([]string, bool) {
 }
 
 // TaskImages replaces step and params images.
-func TaskImages(images map[string]string) mf.Transformer {
+func TaskImages(ctx context.Context, images map[string]string) mf.Transformer {
+	logger := logging.FromContext(ctx)
 	return func(u *unstructured.Unstructured) error {
 		if u.GetKind() != "ClusterTask" && u.GetKind() != "Task" {
 			return nil
@@ -321,7 +322,7 @@ func TaskImages(images map[string]string) mf.Transformer {
 		if !found {
 			return nil
 		}
-		replaceStepsImages(steps, images)
+		replaceStepsImages(steps, images, logger)
 		err = unstructured.SetNestedField(u.Object, steps, "spec", "steps")
 		if err != nil {
 			return err
@@ -334,47 +335,43 @@ func TaskImages(images map[string]string) mf.Transformer {
 		if !found {
 			return nil
 		}
-		replaceParamsImage(params, images)
-		err = unstructured.SetNestedField(u.Object, params, "spec", "params")
-		if err != nil {
-			return err
-		}
-		return nil
+		replaceParamsImage(params, images, logger)
+		return unstructured.SetNestedField(u.Object, params, "spec", "params")
 	}
 }
 
-func replaceStepsImages(steps []interface{}, override map[string]string) {
+func replaceStepsImages(steps []interface{}, override map[string]string, logger *zap.SugaredLogger) {
 	for _, s := range steps {
 		step := s.(map[string]interface{})
 		name, ok := step["name"].(string)
 		if !ok {
-			log.Println("Unable to get the step", "step", s)
+			logger.Debugf("Unable to get the step %v step", s)
 			continue
 		}
 
 		name = formKey("", name)
 		image, found := override[name]
 		if !found || image == "" {
-			log.Println("Image not found", "step", name, "action", "skip")
+			logger.Debugf("Image not found step %s action skip", name)
 			continue
 		}
 		step["image"] = image
 	}
 }
 
-func replaceParamsImage(params []interface{}, override map[string]string) {
+func replaceParamsImage(params []interface{}, override map[string]string, logger *zap.SugaredLogger) {
 	for _, p := range params {
 		param := p.(map[string]interface{})
 		name, ok := param["name"].(string)
 		if !ok {
-			log.Println("Unable to get the pram", "param", p)
+			logger.Debugf("Unable to get the pram %v param", p)
 			continue
 		}
 
 		name = formKey(ParamPrefix, name)
 		image, found := override[name]
 		if !found || image == "" {
-			log.Println("Image not found", "step", name, "action", "skip")
+			logger.Debugf("Image not found step %s action skip", name)
 			continue
 		}
 		param["default"] = image

pkg/reconciler/common/transformers_test.go

@@ -181,7 +181,8 @@ func TestReplaceImages(t *testing.T) {
 
 		manifest, err := mf.ManifestFrom(mf.Recursive(testData))
 		assertNoError(t, err)
-		newManifest, err := manifest.Transform(TaskImages(images))
+		ctx := context.Background()
+		newManifest, err := manifest.Transform(TaskImages(ctx, images))
 		assertNoError(t, err)
 		assertTaskImage(t, newManifest.Resources(), "push", image)
 		assertTaskImage(t, newManifest.Resources(), "build", "$(inputs.params.BUILDER_IMAGE)")
@@ -212,7 +213,8 @@ func TestReplaceImages(t *testing.T) {
 
 		manifest, err := mf.ManifestFrom(mf.Recursive(testData))
 		assertNoError(t, err)
-		newManifest, err := manifest.Transform(TaskImages(images))
+		ctx := context.Background()
+		newManifest, err := manifest.Transform(TaskImages(ctx, images))
 		assertNoError(t, err)
 		assertParamHasImage(t, newManifest.Resources(), "BUILDER_IMAGE", image)
 		assertTaskImage(t, newManifest.Resources(), "push", "buildah")

pkg/reconciler/openshift/tektonaddon/clustertTask.go

@@ -48,7 +48,7 @@ func filterAndTransformClusterTask() client.FilterAndTransform {
 		tfs := []mf.Transformer{
 			replaceKind(KindTask, KindClusterTask),
 			injectLabel(labelProviderType, providerTypeRedHat, overwrite, "ClusterTask"),
-			common.TaskImages(addonImages),
+			common.TaskImages(ctx, addonImages),
 		}
 		if err := transformers(ctx, manifest, addon, tfs...); err != nil {
 			return nil, err

pkg/reconciler/openshift/tektonaddon/clustertTaskVersioned.go

@@ -46,7 +46,7 @@ func filterAndTransformVersionedClusterTask(version string) client.FilterAndTran
 		tfs := []mf.Transformer{
 			replaceKind(KindTask, KindClusterTask),
 			injectLabel(labelProviderType, providerTypeRedHat, overwrite, "ClusterTask"),
-			common.TaskImages(addonImages),
+			common.TaskImages(ctx, addonImages),
 			setVersionedNames(version),
 		}
 		if err := transformers(ctx, manifest, addon, tfs...); err != nil {

pkg/reconciler/openshift/tektonaddon/communityClusterTasks.go

@@ -62,7 +62,7 @@ func filterAndTransformCommunityClusterTask() client.FilterAndTransform {
 		extra := []mf.Transformer{
 			replaceKind("Task", "ClusterTask"),
 			injectLabel(labelProviderType, providerTypeCommunity, overwrite, "ClusterTask"),
-			common.TaskImages(addonImages),
+			common.TaskImages(ctx, addonImages),
 		}
 		if err := common.Transform(ctx, manifest, instance, extra...); err != nil {
 			return nil, err

pkg/reconciler/openshift/tektonaddon/resolverTask.go

@@ -45,7 +45,7 @@ func filterAndTransformResolverTask() client.FilterAndTransform {
 		addonImages := common.ToLowerCaseKeys(common.ImagesFromEnv(common.AddonsImagePrefix))
 		tfs := []mf.Transformer{
 			injectLabel(labelProviderType, providerTypeRedHat, overwrite, "Task"),
-			common.TaskImages(addonImages),
+			common.TaskImages(ctx, addonImages),
 		}
 		if err := transformers(ctx, manifest, addon, tfs...); err != nil {
 			return nil, err

pkg/reconciler/openshift/tektonaddon/transform.go

@@ -38,7 +38,7 @@ func transformers(ctx context.Context, manifest *mf.Manifest, comp v1alpha1.Tekt
 		// about order of future addition of transformers in this reconciler or in sub functions which take care of various addons
 		common.InjectOperandNameLabelPreserveExisting(openshift.OperandOpenShiftPipelinesAddons),
 		injectLabel(labelProviderType, providerTypeRedHat, overwrite, "ClusterTask"),
-		common.TaskImages(addonImages),
+		common.TaskImages(ctx, addonImages),
 	}
 	addonTfs = append(addonTfs, addnTfs...)
 	return common.Transform(ctx, manifest, instance, addonTfs...)