feat: Moved Nginx from OS to Enterprise (#1490)

odigos-io · Sep 5, 2024 · ab1af29 · ab1af29
1 parent b1594fd
commit ab1af29
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -184,7 +184,6 @@ func otelSdkConfigCommunity() map[common.ProgrammingLanguage]common.OtelSdk {
 		common.GoProgrammingLanguage:         common.OtelSdkEbpfCommunity,
 		common.DotNetProgrammingLanguage:     common.OtelSdkNativeCommunity,
 		common.JavascriptProgrammingLanguage: common.OtelSdkNativeCommunity,
-		common.NginxProgrammingLanguage:      common.OtelSdkNativeCommunity,
 	}
 }
 
@@ -195,7 +194,6 @@ func otelSdkConfigCloud() map[common.ProgrammingLanguage]common.OtelSdk {
 		common.GoProgrammingLanguage:         common.OtelSdkEbpfEnterprise,
 		common.DotNetProgrammingLanguage:     common.OtelSdkNativeCommunity,
 		common.JavascriptProgrammingLanguage: common.OtelSdkNativeCommunity,
-		common.NginxProgrammingLanguage:      common.OtelSdkNativeCommunity,
 	}
 }
 
@@ -207,6 +205,7 @@ func otelSdkConfigOnPrem() map[common.ProgrammingLanguage]common.OtelSdk {
 		common.DotNetProgrammingLanguage:     common.OtelSdkNativeCommunity,
 		common.JavascriptProgrammingLanguage: common.OtelSdkEbpfEnterprise,
 		common.MySQLProgrammingLanguage:      common.OtelSdkEbpfEnterprise,
+		common.NginxProgrammingLanguage:      common.OtelSdkNativeCommunity,
 	}
 }
 

diff --git a/instrumentor/controllers/instrumentationdevice/common.go b/instrumentor/controllers/instrumentationdevice/common.go
@@ -3,8 +3,6 @@ package instrumentationdevice
 import (
 	"context"
 	"errors"
-	"github.com/odigos-io/odigos/common"
-
 	odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	"github.com/odigos-io/odigos/common/consts"
 	"github.com/odigos-io/odigos/instrumentor/instrumentation"
@@ -212,14 +210,6 @@ func reconcileSingleWorkload(ctx context.Context, kubeClient client.Client, runt
 		return err
 	}
 
-	for _, runtimeDetail := range runtimeDetails.Spec.RuntimeDetails {
-		if runtimeDetail.Language == common.NginxProgrammingLanguage {
-			err := removeInstrumentationDeviceFromWorkload(ctx, kubeClient, runtimeDetails.Namespace, workloadKind, workloadName, ApplyInstrumentationDeviceReasonNotSupported)
-			conditions.UpdateStatusConditions(ctx, kubeClient, runtimeDetails, &runtimeDetails.Status.Conditions, metav1.ConditionFalse, appliedInstrumentationDeviceType, string(ApplyInstrumentationDeviceReasonNotSupported), "Nginx Instrumentation is Coming Soon!")
-			return err
-		}
-	}
-
 	err = addInstrumentationDeviceToWorkload(ctx, kubeClient, runtimeDetails)
 	if err == nil {
 		conditions.UpdateStatusConditions(ctx, kubeClient, runtimeDetails, &runtimeDetails.Status.Conditions, metav1.ConditionTrue, appliedInstrumentationDeviceType, "InstrumentationDeviceApplied", "Instrumentation device applied successfully")