Remove default SDKs and supported SDKs from Odigos config

api/config/crd/bases/odigos.io_odigosconfigurations.yaml

@@ -80,20 +80,6 @@ spec:
                 type: object
               configVersion:
                 type: integer
-              defaultSDKs:
-                additionalProperties:
-                  properties:
-                    sdkTier:
-                      type: string
-                    sdkType:
-                      description: 'Odigos supports two types of OpenTelemetry SDKs:
-                        native and ebpf.'
-                      type: string
-                  required:
-                  - sdkTier
-                  - sdkType
-                  type: object
-                type: object
               goAutoIncludeCodeAttributes:
                 description: |-
                   this is internal currently, and is not exposed on the CLI / helm
@@ -119,22 +105,6 @@ spec:
                 type: boolean
               psp:
                 type: boolean
-              supportedSDKs:
-                additionalProperties:
-                  items:
-                    properties:
-                      sdkTier:
-                        type: string
-                      sdkType:
-                        description: 'Odigos supports two types of OpenTelemetry SDKs:
-                          native and ebpf.'
-                        type: string
-                    required:
-                    - sdkTier
-                    - sdkType
-                    type: object
-                  type: array
-                type: object
               telemetryEnabled:
                 type: boolean
             required:

api/odigos/v1alpha1/odigosconfig_types.go

@@ -45,8 +45,6 @@ type OdigosConfigurationSpec struct {
 	OdigletImage      string                                          `json:"odigletImage,omitempty"`
 	InstrumentorImage string                                          `json:"instrumentorImage,omitempty"`
 	AutoscalerImage   string                                          `json:"autoscalerImage,omitempty"`
-	SupportedSDKs     map[common.ProgrammingLanguage][]common.OtelSdk `json:"supportedSDKs,omitempty"`
-	DefaultSDKs       map[common.ProgrammingLanguage]common.OtelSdk   `json:"defaultSDKs,omitempty"`
 	CollectorGateway  *CollectorGatewayConfiguration                  `json:"collectorGateway,omitempty"`
 
 	// this is internal currently, and is not exposed on the CLI / helm
@@ -103,7 +101,6 @@ func (odigosConfig *OdigosConfiguration) ToCommonConfig() *common.OdigosConfigur
 		OdigletImage:                odigosConfig.Spec.OdigletImage,
 		InstrumentorImage:           odigosConfig.Spec.InstrumentorImage,
 		AutoscalerImage:             odigosConfig.Spec.AutoscalerImage,
-		DefaultSDKs:                 odigosConfig.Spec.DefaultSDKs,
 		CollectorGateway:            &collectorGateway,
 		GoAutoIncludeCodeAttributes: odigosConfig.Spec.GoAutoIncludeCodeAttributes,
 	}

cli/cmd/install.go

@@ -179,52 +179,10 @@ func createNamespace(ctx context.Context, cmd *cobra.Command, client *kube.Clien
 	return nil
 }
 
-func otelSdkConfigCommunity() map[common.ProgrammingLanguage]common.OtelSdk {
-	return map[common.ProgrammingLanguage]common.OtelSdk{
-		common.JavaProgrammingLanguage:       common.OtelSdkNativeCommunity,
-		common.PythonProgrammingLanguage:     common.OtelSdkNativeCommunity,
-		common.GoProgrammingLanguage:         common.OtelSdkEbpfCommunity,
-		common.DotNetProgrammingLanguage:     common.OtelSdkNativeCommunity,
-		common.JavascriptProgrammingLanguage: common.OtelSdkNativeCommunity,
-	}
-}
-
-func otelSdkConfigCloud() map[common.ProgrammingLanguage]common.OtelSdk {
-	return map[common.ProgrammingLanguage]common.OtelSdk{
-		common.JavaProgrammingLanguage:       common.OtelSdkNativeCommunity,
-		common.PythonProgrammingLanguage:     common.OtelSdkNativeCommunity,
-		common.GoProgrammingLanguage:         common.OtelSdkEbpfEnterprise,
-		common.DotNetProgrammingLanguage:     common.OtelSdkNativeCommunity,
-		common.JavascriptProgrammingLanguage: common.OtelSdkNativeCommunity,
-	}
-}
-
-func otelSdkConfigOnPrem() map[common.ProgrammingLanguage]common.OtelSdk {
-	return map[common.ProgrammingLanguage]common.OtelSdk{
-		common.JavaProgrammingLanguage:       common.OtelSdkEbpfEnterprise, // Notice - for onprem, the default for java is eBPF
-		common.PythonProgrammingLanguage:     common.OtelSdkEbpfEnterprise,
-		common.GoProgrammingLanguage:         common.OtelSdkEbpfEnterprise,
-		common.DotNetProgrammingLanguage:     common.OtelSdkNativeCommunity,
-		common.JavascriptProgrammingLanguage: common.OtelSdkEbpfEnterprise,
-		common.MySQLProgrammingLanguage:      common.OtelSdkEbpfEnterprise,
-		common.NginxProgrammingLanguage:      common.OtelSdkNativeCommunity,
-	}
-}
-
 func createOdigosConfig(odigosTier common.OdigosTier) common.OdigosConfiguration {
 	fullIgnoredNamespaces := utils.MergeDefaultIgnoreWithUserInput(userInputIgnoredNamespaces, consts.SystemNamespaces)
 	fullIgnoredContainers := utils.MergeDefaultIgnoreWithUserInput(userInputIgnoredContainers, consts.IgnoredContainers)
 
-	var defaultOtelSdkPerLanguage map[common.ProgrammingLanguage]common.OtelSdk
-	switch odigosTier {
-	case common.CommunityOdigosTier:
-		defaultOtelSdkPerLanguage = otelSdkConfigCommunity()
-	case common.CloudOdigosTier:
-		defaultOtelSdkPerLanguage = otelSdkConfigCloud()
-	case common.OnPremOdigosTier:
-		defaultOtelSdkPerLanguage = otelSdkConfigOnPrem()
-	}
-
 	selectedProfiles := []common.ProfileName{}
 	profiles := resources.GetAvailableProfilesForTier(odigosTier)
 	for _, profile := range userInputInstallProfiles {
@@ -253,7 +211,6 @@ func createOdigosConfig(odigosTier common.OdigosTier) common.OdigosConfiguration
 		OdigletImage:      odigletImage,
 		InstrumentorImage: instrumentorImage,
 		AutoscalerImage:   autoScalerImage,
-		DefaultSDKs:       defaultOtelSdkPerLanguage,
 		Profiles:          selectedProfiles,
 	}
 }

cli/cmd/resources/instrumentor.go

@@ -44,7 +44,7 @@ func NewInstrumentorServiceAccount(ns string) *corev1.ServiceAccount {
 	}
 }
 
-func NewInstrumentorRoleBinding(ns string) *rbacv1.RoleBinding {
+func NewInstrumentorLeaderElectionRoleBinding(ns string) *rbacv1.RoleBinding {
 	return &rbacv1.RoleBinding{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "RoleBinding",
@@ -68,6 +68,54 @@ func NewInstrumentorRoleBinding(ns string) *rbacv1.RoleBinding {
 	}
 }
 
+func NewInstrumentorRoleBinding(ns string) *rbacv1.RoleBinding {
+	return &rbacv1.RoleBinding{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "RoleBinding",
+			APIVersion: "rbac.authorization.k8s.io/v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "odigos-instrumentor",
+			Namespace: ns,
+		},
+		Subjects: []rbacv1.Subject{
+			{
+				Kind: "ServiceAccount",
+				Name: "odigos-instrumentor",
+			},
+		},
+		RoleRef: rbacv1.RoleRef{
+			APIGroup: "rbac.authorization.k8s.io",
+			Kind:     "Role",
+			Name:     "odigos-instrumentor",
+		},
+	}
+}
+
+func NewInstrumentorRole(ns string) *rbacv1.Role {
+	return &rbacv1.Role{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Role",
+			APIVersion: "rbac.authorization.k8s.io/v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "odigos-instrumentor",
+			Namespace: ns,
+		},
+		Rules: []rbacv1.PolicyRule{
+			{
+				Verbs: []string{
+					"get",
+				},
+				APIGroups: []string{""},
+				Resources: []string{
+					"secrets",
+				},
+			},
+		},
+	}
+}
+
 func NewInstrumentorClusterRole() *rbacv1.ClusterRole {
 	return &rbacv1.ClusterRole{
 		TypeMeta: metav1.TypeMeta{
@@ -168,11 +216,6 @@ func NewInstrumentorClusterRole() *rbacv1.ClusterRole {
 				Resources: []string{"instrumentedapplications/status"},
 				Verbs:     []string{"get", "patch", "update"},
 			},
-			{
-				APIGroups: []string{"odigos.io"},
-				Resources: []string{"odigosconfigurations"},
-				Verbs:     []string{"create", "delete", "get", "list", "patch", "update", "watch"},
-			},
 			{
 				APIGroups: []string{"odigos.io"},
 				Resources: []string{"destinations"},
@@ -587,7 +630,9 @@ func (a *instrumentorResourceManager) InstallFromScratch(ctx context.Context) er
 	certManagerInstalled := isCertManagerInstalled(ctx, a.client)
 	resources := []client.Object{
 		NewInstrumentorServiceAccount(a.ns),
+		NewInstrumentorRole(a.ns),
 		NewInstrumentorRoleBinding(a.ns),
+		NewInstrumentorLeaderElectionRoleBinding(a.ns),
 		NewInstrumentorClusterRole(),
 		NewInstrumentorClusterRoleBinding(a.ns),
 		NewInstrumentorDeployment(a.ns, a.odigosVersion, a.config.TelemetryEnabled, a.config.ImagePrefix, a.config.InstrumentorImage),

common/odigos_config.go

@@ -42,7 +42,6 @@ type OdigosConfiguration struct {
 	OdigletImage      string                          `json:"odigletImage,omitempty"`
 	InstrumentorImage string                          `json:"instrumentorImage,omitempty"`
 	AutoscalerImage   string                          `json:"autoscalerImage,omitempty"`
-	DefaultSDKs       map[ProgrammingLanguage]OtelSdk `json:"defaultSDKs,omitempty"`
 	CollectorGateway  *CollectorGatewayConfiguration  `json:"collectorGateway,omitempty"`
 	CollectorNode     *CollectorNodeConfiguration     `json:"collectorNode,omitempty"`
 	Profiles          []ProfileName                   `json:"profiles,omitempty"`

helm/odigos/templates/instrumentor/clusterrole.yaml

@@ -58,7 +58,6 @@ rules:
     resources:
       - collectorsgroups
       - instrumentedapplications
-      - odigosconfigurations
       - destinations
     verbs:
       - create

helm/odigos/templates/instrumentor/role.yaml

@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: odigos-instrumentor
+  namespace: {{ .Release.Namespace }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get

helm/odigos/templates/instrumentor/rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: odigos-instrumentor
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: odigos-instrumentor
+subjects:
+- kind: ServiceAccount
+  name: odigos-instrumentor
+  namespace: {{ .Release.Namespace }}

instrumentor/controllers/instrumentationdevice/common.go

@@ -9,9 +9,9 @@ import (
 	"github.com/odigos-io/odigos/instrumentor/controllers/utils"
 	"github.com/odigos-io/odigos/instrumentor/controllers/utils/versionsupport"
 	"github.com/odigos-io/odigos/instrumentor/instrumentation"
+	"github.com/odigos-io/odigos/instrumentor/sdks"
 	"github.com/odigos-io/odigos/k8sutils/pkg/conditions"
 	"github.com/odigos-io/odigos/k8sutils/pkg/env"
-	k8sutils "github.com/odigos-io/odigos/k8sutils/pkg/utils"
 	"github.com/odigos-io/odigos/k8sutils/pkg/workload"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -35,6 +35,11 @@ const (
 	appliedInstrumentationDeviceType = "AppliedInstrumentationDevice"
 )
 
+var (
+	// can be overridden in tests
+	GetDefaultSDKs = sdks.GetDefaultSDKs
+)
+
 func clearInstrumentationEbpf(obj client.Object) {
 	annotations := obj.GetAnnotations()
 	if annotations == nil {
@@ -82,11 +87,6 @@ func addInstrumentationDeviceToWorkload(ctx context.Context, kubeClient client.C
 		Kind:      workload.WorkloadKind(obj.GetObjectKind().GroupVersionKind().Kind),
 	}
 
-	odigosConfig, err := k8sutils.GetCurrentOdigosConfig(ctx, kubeClient)
-	if err != nil {
-		return err
-	}
-
 	// build an otel sdk map from instrumentation rules first, and merge it with the default otel sdk map
 	// this way, we can override the default otel sdk with the instrumentation rules
 	instrumentationRules := odigosv1.InstrumentationRuleList{}
@@ -95,7 +95,8 @@ func addInstrumentationDeviceToWorkload(ctx context.Context, kubeClient client.C
 		return err
 	}
 
-	otelSdkToUse := odigosConfig.DefaultSDKs
+	// default otel sdk map according to Odigos tier
+	otelSdkToUse := GetDefaultSDKs()
 
 	for i := range instrumentationRules.Items {
 		instrumentationRule := &instrumentationRules.Items[i]