From 3464ea641cddc7a624f0dd64a8c24220acfc6a09 Mon Sep 17 00:00:00 2001 From: Milica Cvrkota Date: Thu, 8 Aug 2024 17:07:24 +0200 Subject: [PATCH] add logging --- api/v1/instanaagent_types.go | 4 ++-- controllers/util.go | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/api/v1/instanaagent_types.go b/api/v1/instanaagent_types.go index 9710bd55..86d04f7d 100644 --- a/api/v1/instanaagent_types.go +++ b/api/v1/instanaagent_types.go @@ -173,8 +173,8 @@ func (in *InstanaAgent) Default() { optional.ValueOrDefault(&in.Spec.K8sSensor.ImageSpec.Tag, "latest") optional.ValueOrDefault(&in.Spec.K8sSensor.ImageSpec.PullPolicy, corev1.PullAlways) optional.ValueOrDefault(&in.Spec.K8sSensor.DeploymentSpec.Replicas, 3) - optional.ValueOrDefault(&in.Spec.ServiceMesh.Namespace, "istio-system") - optional.ValueOrDefault(&in.Spec.ServiceMesh.Configmap, "istio") + optional.ValueOrDefault(&in.Spec.Agent.ServiceMesh.Namespace, "istio-system") + optional.ValueOrDefault(&in.Spec.Agent.ServiceMesh.Configmap, "istio") } // +kubebuilder:object:root=true diff --git a/controllers/util.go b/controllers/util.go index f58f560a..9acd4fef 100644 --- a/controllers/util.go +++ b/controllers/util.go @@ -19,6 +19,7 @@ package controllers import ( "context" + "fmt" "strings" "github.com/go-logr/logr" @@ -60,6 +61,7 @@ func (r *InstanaAgentReconciler) getIstioOutboundConfigAndNodeIps(ctx context.Co log := logf.FromContext(ctx) var nodeIPs []string + log.Info("Check if REGISTRY_ONLY is enabled") isIstioRegistryOnlyEnabled := r.checkRegistryOnlyMode(ctx, namespace, configmap) if isIstioRegistryOnlyEnabled { @@ -75,11 +77,15 @@ func (r *InstanaAgentReconciler) getIstioOutboundConfigAndNodeIps(ctx context.Co func (r *InstanaAgentReconciler) checkRegistryOnlyMode(ctx context.Context, namespace string, configmap string) bool { istioConfigMap := &corev1.ConfigMap{} + log := logf.FromContext(ctx) + log.Info(fmt.Sprintf("Checking Istio ConfigMap %s in namespace %s for outbound traffic policy", configmap, namespace)) err := r.client.Get(ctx, types.NamespacedName{Name: configmap, Namespace: namespace}, istioConfigMap) if err != nil { + log.Error(err, "Failed fetching istio ConfigMap") return false } if istioConfigMap.Data == nil { + log.Info(fmt.Sprintf("Istio configmap %s in namespace %s data in nil", configmap, namespace)) return false } meshConfigData, ok := istioConfigMap.Data["mesh"] @@ -88,10 +94,13 @@ func (r *InstanaAgentReconciler) checkRegistryOnlyMode(ctx context.Context, name } var meshConfig IstioMeshConfig + log.Info("Unmarshalling config data") err = yaml.Unmarshal([]byte(meshConfigData), &meshConfig) if err != nil { + log.Error(err, "Unmarshalling config data ERROR") return false } + log.Info("Checking if policy is REGISTRY_ONLY") return strings.EqualFold(meshConfig.OutboundTrafficPolicy.Mode, "REGISTRY_ONLY") }