From 19fdee1c57d83cc41c07fd7c8467a730cbb80207 Mon Sep 17 00:00:00 2001 From: yodigos Date: Thu, 5 Sep 2024 14:06:46 +0300 Subject: [PATCH] Moved Nginx from OS to Enterprise --- cli/cmd/install.go | 3 +-- .../controllers/instrumentationdevice/common.go | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/cli/cmd/install.go b/cli/cmd/install.go index 06dde16e8..11314db95 100644 --- 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 index b0d24c51f..0a2d31203 100644 --- 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")