From 3dcfa1460a2aee402a96aa3e1d892504130471a6 Mon Sep 17 00:00:00 2001
From: Tamir David <tamir@odigos.io>
Date: Sun, 17 Nov 2024 16:13:23 +0200
Subject: [PATCH] feat: enable webhook also for enterprise (#1761)

Simplified the `SetInjectInstrumentationLabel` function by removing the
`odigosTier` variable and the conditional check for the community tier,
ensuring that the instrumentation label is always injected.
---
 instrumentor/instrumentation/instrumentation.go | 16 ++++++----------
 k8sutils/pkg/consts/consts.go                   |  8 ++++++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/instrumentor/instrumentation/instrumentation.go b/instrumentor/instrumentation/instrumentation.go
index 94b6803bf..d7a9d598c 100644
--- a/instrumentor/instrumentation/instrumentation.go
+++ b/instrumentor/instrumentation/instrumentation.go
@@ -8,10 +8,10 @@ import (
 	"github.com/go-logr/logr"
 	odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	"github.com/odigos-io/odigos/common/envOverwrite"
+	"github.com/odigos-io/odigos/k8sutils/pkg/consts"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/odigos-io/odigos/common"
-	"github.com/odigos-io/odigos/k8sutils/pkg/env"
 	"github.com/odigos-io/odigos/k8sutils/pkg/envoverwrite"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -268,22 +268,18 @@ func patchEnvVarsForContainer(runtimeDetails *odigosv1.InstrumentedApplication,
 }
 
 func SetInjectInstrumentationLabel(original *corev1.PodTemplateSpec) {
-	odigosTier := env.GetOdigosTierFromEnv()
 
-	// inject the instrumentation annotation for oss tier only
-	if odigosTier == common.CommunityOdigosTier {
-		if original.Labels == nil {
-			original.Labels = make(map[string]string)
-		}
-		original.Labels["odigos.io/inject-instrumentation"] = "true"
+	if original.Labels == nil {
+		original.Labels = make(map[string]string)
 	}
+	original.Labels[consts.OdigosInjectInstrumentationLabel] = "true"
 }
 
 // RemoveInjectInstrumentationLabel removes the "odigos.io/inject-instrumentation" label if it exists.
 func RemoveInjectInstrumentationLabel(original *corev1.PodTemplateSpec) bool {
 	if original.Labels != nil {
-		if _, ok := original.Labels["odigos.io/inject-instrumentation"]; ok {
-			delete(original.Labels, "odigos.io/inject-instrumentation")
+		if _, ok := original.Labels[consts.OdigosInjectInstrumentationLabel]; ok {
+			delete(original.Labels, consts.OdigosInjectInstrumentationLabel)
 			return true
 		}
 	}
diff --git a/k8sutils/pkg/consts/consts.go b/k8sutils/pkg/consts/consts.go
index 3ee028eb8..686370f2a 100644
--- a/k8sutils/pkg/consts/consts.go
+++ b/k8sutils/pkg/consts/consts.go
@@ -9,8 +9,12 @@ const (
 	CollectorsRoleNodeCollector  CollectorRole = "NODE_COLLECTOR"
 )
 
-// OdigosCollectorRoleLabel is the label used to identify the role of the Odigos collector.
-const OdigosCollectorRoleLabel = "odigos.io/collector-role"
+const (
+	// OdigosInjectInstrumentationLabel is the label used to enable the mutating webhook.
+	OdigosInjectInstrumentationLabel = "odigos.io/inject-instrumentation"
+	// OdigosCollectorRoleLabel is the label used to identify the role of the Odigos collector.
+	OdigosCollectorRoleLabel = "odigos.io/collector-role"
+)
 
 const (
 	OdigosDeploymentConfigMapName = "odigos-deployment"