Mountinfo optimization, Refine workload and namespace reconcilers predicates

cli/cmd/install.go

@@ -196,7 +196,7 @@ func createKubeResourceWithLogging(ctx context.Context, msg string, client *kube
 
 func init() {
  rootCmd.AddCommand(installCmd)
- installCmd.Flags().StringVarP(&namespaceFlag, "namespace", "n", consts.DefaultNamespace, "target k8s namespace for Odigos installation")
+ installCmd.Flags().StringVarP(&namespaceFlag, "namespace", "n", consts.DefaultOdigosNamespace, "target k8s namespace for Odigos installation")
  installCmd.Flags().StringVarP(&odigosCloudApiKeyFlag, "api-key", "k", "", "api key for odigos cloud")
  installCmd.Flags().StringVarP(&odigosOnPremToken, "onprem-token", "", "", "authentication token for odigos enterprise on-premises")
  installCmd.Flags().BoolVar(&skipWait, "nowait", false, "skip waiting for odigos pods to be ready")

common/consts/consts.go

@@ -6,7 +6,7 @@ import (
 
 const (
  CurrentNamespaceEnvVar = "CURRENT_NS"
- DefaultNamespace  = "odigos-system"
+ DefaultOdigosNamespace = "odigos-system"
  DefaultOdigosConfigurationName = "odigos-config"
  OTLPPort = 4317
  OTLPHttpPort = 4318
@@ -23,14 +23,14 @@ const (
  ManifestEnvOriginalValAnnotation = "odigos.io/manifest-env-original-val"
  // Used to label instrumentation instances by the corresponding
  // instrumented app for better query performance.
- InstrumentedAppNameLabel  = "instrumented-app"
+ InstrumentedAppNameLabel = "instrumented-app"
 )
 
 var (
  PodsNotFoundErr = errors.New("could not find a ready pod")
 )
 
 var (
- SystemNamespaces = []string{DefaultNamespace, "kube-system", "local-path-storage", "istio-system", "linkerd", "kube-node-lease"}
+ SystemNamespaces = []string{DefaultOdigosNamespace, "kube-system", "local-path-storage", "istio-system", "linkerd", "kube-node-lease"}
  IgnoredContainers = []string{"istio-proxy"}
 )

frontend/go.mod

@@ -20,6 +20,7 @@ require (
  github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+ github.com/evanphx/json-patch/v5 v5.9.0 // indirect
  github.com/fatih/color v1.10.0 // indirect
  github.com/gabriel-vasile/mimetype v1.4.2 // indirect
  github.com/gin-contrib/sse v0.1.0 // indirect
@@ -49,6 +50,7 @@ require (
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+ github.com/pkg/errors v0.9.1 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
  github.com/ugorji/go/codec v1.2.11 // indirect

frontend/go.sum

@@ -10,6 +10,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
+github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
+github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
 github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
@@ -23,6 +27,8 @@ github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
+github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
 github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
@@ -113,6 +119,8 @@ github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZO
 github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
 github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
@@ -146,6 +154,10 @@ go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
 go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
 go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
 go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
 golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
@@ -155,6 +167,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -231,6 +245,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 k8s.io/api v0.30.0 h1:siWhRq7cNjy2iHssOB9SCGNCl2spiF1dO3dABqZ8niA=
 k8s.io/api v0.30.0/go.mod h1:OPlaYhoHs8EQ1ql0R/TsUgaRPhpKNxIMrKQfWUp8QSE=
+k8s.io/apiextensions-apiserver v0.30.0 h1:jcZFKMqnICJfRxTgnC4E+Hpcq8UEhT8B2lhBcQ+6uAs=
+k8s.io/apiextensions-apiserver v0.30.0/go.mod h1:N9ogQFGcrbWqAY9p2mUAL5mGxsLqwgtUce127VtRX5Y=
 k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
 k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
 k8s.io/client-go v0.30.0 h1:sB1AGGlhY/o7KCyCEQ0bPWzYDL0pwOZO4vAtTSh/gJQ=

frontend/main.go

@@ -53,7 +53,7 @@ func parseFlags() Flags {
  flag.IntVar(&flags.Port, "port", defaultPort, "Port to listen on")
  flag.BoolVar(&flags.Debug, "debug", false, "Enable debug mode")
  flag.StringVar(&flags.KubeConfig, "kubeconfig", defaultKubeConfig, "Path to kubeconfig file")
- flag.StringVar(&flags.Namespace, "namespace", consts.DefaultNamespace, "Kubernetes namespace where Odigos is installed")
+ flag.StringVar(&flags.Namespace, "namespace", consts.DefaultOdigosNamespace, "Kubernetes namespace where Odigos is installed")
  flag.Parse()
  return flags
 }

k8sutils/pkg/env/env.go

@@ -23,7 +23,7 @@ func getEnvVarOrDefault(envKey string, defaultVal string) string {
 }
 
 func GetCurrentNamespace() string {
- return getEnvVarOrDefault(consts.CurrentNamespaceEnvVar, consts.DefaultNamespace)
+ return getEnvVarOrDefault(consts.CurrentNamespaceEnvVar, consts.DefaultOdigosNamespace)
 }
 
 func GetDefaultKubeConfigPath() string {

k8sutils/pkg/env/env_test.go

@@ -44,7 +44,7 @@ func TestGetCurrentNamespace_EnvVarExists(t *testing.T) {
 func TestGetCurrentNamespace_EnvVarNotExists(t *testing.T) {
  os.Unsetenv(consts.CurrentNamespaceEnvVar) // Ensure the environment variable is not set
 
- expectedNamespace := consts.DefaultNamespace
+ expectedNamespace := consts.DefaultOdigosNamespace
  got := GetCurrentNamespace()
  if got != expectedNamespace {
  t.Errorf("GetCurrentNamespace() = %q, want %q", got, expectedNamespace)

k8sutils/pkg/workload/workload.go

@@ -3,8 +3,60 @@ package workload
 import (
  "errors"
  "strings"
+
+ "github.com/odigos-io/odigos/common/consts"
+ "k8s.io/api/apps/v1"
+ "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+type Workload interface {
+ client.Object
+ AvailableReplicas() int32
+}
+
+// compile time check for interface implementation
+var _ Workload = &DeploymentWorkload{}
+var _ Workload = &DaemonSetWorkload{}
+var _ Workload = &StatefulSetWorkload{}
+
+type DeploymentWorkload struct {
+ *v1.Deployment
+}
+
+func (d *DeploymentWorkload) AvailableReplicas() int32 {
+ return d.Status.AvailableReplicas
+}
+
+type DaemonSetWorkload struct {
+ *v1.DaemonSet
+}
+
+func (d *DaemonSetWorkload) AvailableReplicas() int32 {
+ return d.Status.NumberReady
+}
+
+type StatefulSetWorkload struct {
+ *v1.StatefulSet
+}
+
+func (s *StatefulSetWorkload) AvailableReplicas() int32 {
+ return s.Status.ReadyReplicas
+}
+
+func ObjectToWorkload(obj client.Object) (Workload, error) {
+ switch t := obj.(type) {
+ case *v1.Deployment:
+ return &DeploymentWorkload{Deployment: t}, nil
+ case *v1.DaemonSet:
+ return &DaemonSetWorkload{DaemonSet: t}, nil
+ case *v1.StatefulSet:
+ return &StatefulSetWorkload{StatefulSet: t}, nil
+ default:
+ return nil, errors.New("unknown kind")
+ }
+}
+
+
 // runtime name is a way to store workload specific CRs with odigos
 // and give the k8s object a name which is unique and can be used to extract the workload name and kind
 func GetRuntimeObjectName(name string, kind string) string {
@@ -38,3 +90,17 @@ func kindFromLowercase(lowercaseKind string) (string, error) {
  return "", errors.New("unknown kind")
  }
 }
+
+func IsObjectLabeledForInstrumentation(obj client.Object) bool {
+ labels := obj.GetLabels()
+ if labels == nil {
+ return false
+ }
+
+ val, exists := labels[consts.OdigosInstrumentationLabel]
+ if !exists {
+ return false
+ }
+
+ return val == consts.InstrumentationEnabled
+}

odiglet/go.mod

@@ -3,11 +3,11 @@ module github.com/odigos-io/odigos/odiglet
 go 1.22.0
 
 require (
- github.com/fntlnz/mountinfo v1.0.1
  github.com/go-logr/logr v1.4.2
  github.com/go-logr/zapr v1.3.0
  github.com/google/uuid v1.6.0
  github.com/kubevirt/device-plugin-manager v1.19.5
+ github.com/moby/sys/mountinfo v0.7.1
  github.com/odigos-io/odigos/api v0.0.0-00010101000000-000000000000
  github.com/odigos-io/odigos/common v1.0.48
  github.com/odigos-io/odigos/k8sutils v0.0.0

odiglet/go.sum

@@ -74,8 +74,6 @@ github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0
 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
 github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fntlnz/mountinfo v1.0.1 h1:I06izqp+/BwMPjdhuNnCZWOaOs5EaFFLXKdFB/lfKxk=
-github.com/fntlnz/mountinfo v1.0.1/go.mod h1:k6q/bWiHuceDCdNRih4YtGy99p8LROjL5dBH6D9/lhg=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -224,6 +222,8 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
+github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@@ -452,6 +452,7 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

odiglet/pkg/kube/runtime_details/manager.go

@@ -52,7 +52,7 @@ func SetupWithManager(mgr ctrl.Manager) error {
  err = builder.
  ControllerManagedBy(mgr).
  For(&corev1.Namespace{}).
- WithEventFilter(&WorkloadEnabledPredicate{}).
+ WithEventFilter(&nameSpaceEnabledPredicate{}).
  Owns(&odigosv1.InstrumentedApplication{}).
  Complete(&NamespacesReconciler{
  Client: mgr.GetClient(),

odiglet/pkg/kube/runtime_details/namespace_predicate.go

@@ -0,0 +1,44 @@
+package runtime_details
+
+import (
+ "github.com/odigos-io/odigos/k8sutils/pkg/workload"
+ corev1 "k8s.io/api/core/v1"
+ "sigs.k8s.io/controller-runtime/pkg/event"
+ "sigs.k8s.io/controller-runtime/pkg/predicate"
+)
+
+type nameSpaceEnabledPredicate struct {
+ predicate.Funcs
+}
+
+func (i *nameSpaceEnabledPredicate) Create(e event.CreateEvent) bool {
+ return false
+}
+
+func (i *nameSpaceEnabledPredicate) Update(e event.UpdateEvent) bool {
+ if e.ObjectOld == nil {
+ return false
+ }
+ if e.ObjectNew == nil {
+ return false
+ }
+ _, ok := e.ObjectNew.(*corev1.Namespace)
+ if !ok {
+ return false
+ }
+
+ oldEnabled := workload.IsObjectLabeledForInstrumentation(e.ObjectOld)
+ newEnabled := workload.IsObjectLabeledForInstrumentation(e.ObjectNew)
+
+ return !oldEnabled && newEnabled
+}
+
+func (i *nameSpaceEnabledPredicate) Delete(e event.DeleteEvent) bool {
+ // no need to calculate runtime details for deleted workloads
+ return false
+}
+
+func (i *nameSpaceEnabledPredicate) Generic(e event.GenericEvent) bool {
+ // not sure when exactly this would be called, but we don't need to handle it
+ return false
+}

odiglet/pkg/kube/runtime_details/namespaces.go

@@ -4,6 +4,8 @@ import (
  "context"
 
  appsv1 "k8s.io/api/apps/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8sutils "github.com/odigos-io/odigos/k8sutils/pkg/workload"
  "k8s.io/apimachinery/pkg/runtime"
  ctrl "sigs.k8s.io/controller-runtime"
  "sigs.k8s.io/controller-runtime/pkg/client"
@@ -18,8 +20,19 @@ type NamespacesReconciler struct {
 func (n *NamespacesReconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) {
  logger := log.FromContext(ctx)
 
+ var ns corev1.Namespace
+ err := n.Get(ctx, request.NamespacedName, &ns)
+ if err != nil {
+ logger.Error(err, "error fetching namespace object")
+ return ctrl.Result{}, err
+ }
+
+ if !k8sutils.IsObjectLabeledForInstrumentation(&ns) {
+ return ctrl.Result{}, nil
+ }
+
  var deps appsv1.DeploymentList
- err := n.Client.List(ctx, &deps, client.InNamespace(request.Name))
+ err = n.Client.List(ctx, &deps, client.InNamespace(request.Name))
  if client.IgnoreNotFound(err) != nil {
  logger.Error(err, "error fetching deployments")
  return ctrl.Result{}, err

odiglet/pkg/kube/runtime_details/shared.go

@@ -34,7 +34,7 @@ func inspectRuntimesOfRunningPods(ctx context.Context, logger *logr.Logger, labe
  }
 
  odigosConfig := &odigosv1.OdigosConfiguration{}
- err = kubeClient.Get(ctx, client.ObjectKey{Namespace: "odigos-system", Name: consts.DefaultOdigosConfigurationName}, odigosConfig)
+ err = kubeClient.Get(ctx, client.ObjectKey{Namespace: consts.DefaultOdigosNamespace, Name: consts.DefaultOdigosConfigurationName}, odigosConfig)
  if err != nil {
  logger.Error(err, "error fetching odigos configuration")
  return ctrl.Result{}, err