diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/addclusterinfo.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/addclusterinfo.go
index ad1f05d294..da173318f0 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/addclusterinfo.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/addclusterinfo.go
@@ -47,7 +47,7 @@ func AddClusterInfo(name, namespace string) *AddClusterInfoApplyConfiguration {
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithKind(value string) *AddClusterInfoApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *AddClusterInfoApplyConfiguration) WithKind(value string) *AddClusterInf
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithAPIVersion(value string) *AddClusterInfoApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *AddClusterInfoApplyConfiguration) WithAPIVersion(value string) *AddClus
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithName(value string) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *AddClusterInfoApplyConfiguration) WithName(value string) *AddClusterInf
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithGenerateName(value string) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *AddClusterInfoApplyConfiguration) WithGenerateName(value string) *AddCl
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithNamespace(value string) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *AddClusterInfoApplyConfiguration) WithNamespace(value string) *AddClust
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithUID(value types.UID) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *AddClusterInfoApplyConfiguration) WithUID(value types.UID) *AddClusterI
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithResourceVersion(value string) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *AddClusterInfoApplyConfiguration) WithResourceVersion(value string) *Ad
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithGeneration(value int64) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *AddClusterInfoApplyConfiguration) WithGeneration(value int64) *AddClust
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithCreationTimestamp(value metav1.Time) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *AddClusterInfoApplyConfiguration) WithCreationTimestamp(value metav1.Ti
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *AddClusterInfoApplyConfiguration) WithDeletionTimestamp(value metav1.Ti
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *AddClusterInfoApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *AddClusterInfoApplyConfiguration) WithDeletionGracePeriodSeconds(value
 // overwriting an existing map entries in Labels field with the same key.
 func (b *AddClusterInfoApplyConfiguration) WithLabels(entries map[string]string) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *AddClusterInfoApplyConfiguration) WithLabels(entries map[string]string)
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *AddClusterInfoApplyConfiguration) WithAnnotations(entries map[string]string) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *AddClusterInfoApplyConfiguration) WithOwnerReferences(values ...*v1.Own
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *AddClusterInfoApplyConfiguration) WithOwnerReferences(values ...*v1.Own
 func (b *AddClusterInfoApplyConfiguration) WithFinalizers(values ...string) *AddClusterInfoApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *AddClusterInfoApplyConfiguration) WithStatus(value *AddClusterInfoStatu
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *AddClusterInfoApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/deleteattribute.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/deleteattribute.go
index 7a5a32b59f..8a0e0a4f88 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/deleteattribute.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/deleteattribute.go
@@ -47,7 +47,7 @@ func DeleteAttribute(name, namespace string) *DeleteAttributeApplyConfiguration
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithKind(value string) *DeleteAttributeApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *DeleteAttributeApplyConfiguration) WithKind(value string) *DeleteAttrib
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithAPIVersion(value string) *DeleteAttributeApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *DeleteAttributeApplyConfiguration) WithAPIVersion(value string) *Delete
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithName(value string) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *DeleteAttributeApplyConfiguration) WithName(value string) *DeleteAttrib
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithGenerateName(value string) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *DeleteAttributeApplyConfiguration) WithGenerateName(value string) *Dele
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithNamespace(value string) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *DeleteAttributeApplyConfiguration) WithNamespace(value string) *DeleteA
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithUID(value types.UID) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *DeleteAttributeApplyConfiguration) WithUID(value types.UID) *DeleteAttr
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithResourceVersion(value string) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *DeleteAttributeApplyConfiguration) WithResourceVersion(value string) *D
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithGeneration(value int64) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *DeleteAttributeApplyConfiguration) WithGeneration(value int64) *DeleteA
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithCreationTimestamp(value metav1.Time) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *DeleteAttributeApplyConfiguration) WithCreationTimestamp(value metav1.T
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *DeleteAttributeApplyConfiguration) WithDeletionTimestamp(value metav1.T
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *DeleteAttributeApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *DeleteAttributeApplyConfiguration) WithDeletionGracePeriodSeconds(value
 // overwriting an existing map entries in Labels field with the same key.
 func (b *DeleteAttributeApplyConfiguration) WithLabels(entries map[string]string) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *DeleteAttributeApplyConfiguration) WithLabels(entries map[string]string
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *DeleteAttributeApplyConfiguration) WithAnnotations(entries map[string]string) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *DeleteAttributeApplyConfiguration) WithOwnerReferences(values ...*v1.Ow
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *DeleteAttributeApplyConfiguration) WithOwnerReferences(values ...*v1.Ow
 func (b *DeleteAttributeApplyConfiguration) WithFinalizers(values ...string) *DeleteAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *DeleteAttributeApplyConfiguration) WithStatus(value *DeleteAttributeSta
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *DeleteAttributeApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/errorsampler.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/errorsampler.go
index 113b60169d..f25695dda8 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/errorsampler.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/errorsampler.go
@@ -47,7 +47,7 @@ func ErrorSampler(name, namespace string) *ErrorSamplerApplyConfiguration {
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithKind(value string) *ErrorSamplerApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *ErrorSamplerApplyConfiguration) WithKind(value string) *ErrorSamplerApp
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithAPIVersion(value string) *ErrorSamplerApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *ErrorSamplerApplyConfiguration) WithAPIVersion(value string) *ErrorSamp
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithName(value string) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *ErrorSamplerApplyConfiguration) WithName(value string) *ErrorSamplerApp
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithGenerateName(value string) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *ErrorSamplerApplyConfiguration) WithGenerateName(value string) *ErrorSa
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithNamespace(value string) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *ErrorSamplerApplyConfiguration) WithNamespace(value string) *ErrorSampl
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithUID(value types.UID) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *ErrorSamplerApplyConfiguration) WithUID(value types.UID) *ErrorSamplerA
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithResourceVersion(value string) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *ErrorSamplerApplyConfiguration) WithResourceVersion(value string) *Erro
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithGeneration(value int64) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *ErrorSamplerApplyConfiguration) WithGeneration(value int64) *ErrorSampl
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *ErrorSamplerApplyConfiguration) WithCreationTimestamp(value metav1.Time
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *ErrorSamplerApplyConfiguration) WithDeletionTimestamp(value metav1.Time
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *ErrorSamplerApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *ErrorSamplerApplyConfiguration) WithDeletionGracePeriodSeconds(value in
 // overwriting an existing map entries in Labels field with the same key.
 func (b *ErrorSamplerApplyConfiguration) WithLabels(entries map[string]string) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *ErrorSamplerApplyConfiguration) WithLabels(entries map[string]string) *
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *ErrorSamplerApplyConfiguration) WithAnnotations(entries map[string]string) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *ErrorSamplerApplyConfiguration) WithOwnerReferences(values ...*v1.Owner
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *ErrorSamplerApplyConfiguration) WithOwnerReferences(values ...*v1.Owner
 func (b *ErrorSamplerApplyConfiguration) WithFinalizers(values ...string) *ErrorSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *ErrorSamplerApplyConfiguration) WithStatus(value *ErrorSamplerStatusApp
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *ErrorSamplerApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/latencysampler.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/latencysampler.go
index 1043e4768e..0ab9e6da8a 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/latencysampler.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/latencysampler.go
@@ -47,7 +47,7 @@ func LatencySampler(name, namespace string) *LatencySamplerApplyConfiguration {
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithKind(value string) *LatencySamplerApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *LatencySamplerApplyConfiguration) WithKind(value string) *LatencySample
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithAPIVersion(value string) *LatencySamplerApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *LatencySamplerApplyConfiguration) WithAPIVersion(value string) *Latency
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithName(value string) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *LatencySamplerApplyConfiguration) WithName(value string) *LatencySample
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithGenerateName(value string) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *LatencySamplerApplyConfiguration) WithGenerateName(value string) *Laten
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithNamespace(value string) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *LatencySamplerApplyConfiguration) WithNamespace(value string) *LatencyS
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithUID(value types.UID) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *LatencySamplerApplyConfiguration) WithUID(value types.UID) *LatencySamp
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithResourceVersion(value string) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *LatencySamplerApplyConfiguration) WithResourceVersion(value string) *La
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithGeneration(value int64) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *LatencySamplerApplyConfiguration) WithGeneration(value int64) *LatencyS
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithCreationTimestamp(value metav1.Time) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *LatencySamplerApplyConfiguration) WithCreationTimestamp(value metav1.Ti
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *LatencySamplerApplyConfiguration) WithDeletionTimestamp(value metav1.Ti
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *LatencySamplerApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *LatencySamplerApplyConfiguration) WithDeletionGracePeriodSeconds(value
 // overwriting an existing map entries in Labels field with the same key.
 func (b *LatencySamplerApplyConfiguration) WithLabels(entries map[string]string) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *LatencySamplerApplyConfiguration) WithLabels(entries map[string]string)
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *LatencySamplerApplyConfiguration) WithAnnotations(entries map[string]string) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *LatencySamplerApplyConfiguration) WithOwnerReferences(values ...*v1.Own
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *LatencySamplerApplyConfiguration) WithOwnerReferences(values ...*v1.Own
 func (b *LatencySamplerApplyConfiguration) WithFinalizers(values ...string) *LatencySamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *LatencySamplerApplyConfiguration) WithStatus(value *LatencySamplerStatu
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *LatencySamplerApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/piimasking.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/piimasking.go
index 38171b99e2..2061a72def 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/piimasking.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/piimasking.go
@@ -47,7 +47,7 @@ func PiiMasking(name, namespace string) *PiiMaskingApplyConfiguration {
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithKind(value string) *PiiMaskingApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *PiiMaskingApplyConfiguration) WithKind(value string) *PiiMaskingApplyCo
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithAPIVersion(value string) *PiiMaskingApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *PiiMaskingApplyConfiguration) WithAPIVersion(value string) *PiiMaskingA
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithName(value string) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *PiiMaskingApplyConfiguration) WithName(value string) *PiiMaskingApplyCo
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithGenerateName(value string) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *PiiMaskingApplyConfiguration) WithGenerateName(value string) *PiiMaskin
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithNamespace(value string) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *PiiMaskingApplyConfiguration) WithNamespace(value string) *PiiMaskingAp
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithUID(value types.UID) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *PiiMaskingApplyConfiguration) WithUID(value types.UID) *PiiMaskingApply
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithResourceVersion(value string) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *PiiMaskingApplyConfiguration) WithResourceVersion(value string) *PiiMas
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithGeneration(value int64) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *PiiMaskingApplyConfiguration) WithGeneration(value int64) *PiiMaskingAp
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithCreationTimestamp(value metav1.Time) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *PiiMaskingApplyConfiguration) WithCreationTimestamp(value metav1.Time)
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *PiiMaskingApplyConfiguration) WithDeletionTimestamp(value metav1.Time)
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *PiiMaskingApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *PiiMaskingApplyConfiguration) WithDeletionGracePeriodSeconds(value int6
 // overwriting an existing map entries in Labels field with the same key.
 func (b *PiiMaskingApplyConfiguration) WithLabels(entries map[string]string) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *PiiMaskingApplyConfiguration) WithLabels(entries map[string]string) *Pi
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *PiiMaskingApplyConfiguration) WithAnnotations(entries map[string]string) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *PiiMaskingApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRe
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *PiiMaskingApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRe
 func (b *PiiMaskingApplyConfiguration) WithFinalizers(values ...string) *PiiMaskingApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *PiiMaskingApplyConfiguration) WithStatus(value *PiiMaskingStatusApplyCo
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *PiiMaskingApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/piimaskingspec.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/piimaskingspec.go
index 41d5e1b2ee..75e448786c 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/piimaskingspec.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/piimaskingspec.go
@@ -18,18 +18,18 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	common "github.com/odigos-io/odigos/common"
 )
 
 // PiiMaskingSpecApplyConfiguration represents a declarative configuration of the PiiMaskingSpec type for use
 // with apply.
 type PiiMaskingSpecApplyConfiguration struct {
-	ActionName    *string                      `json:"actionName,omitempty"`
-	Notes         *string                      `json:"notes,omitempty"`
-	Disabled      *bool                        `json:"disabled,omitempty"`
-	Signals       []common.ObservabilitySignal `json:"signals,omitempty"`
-	PiiCategories []v1alpha1.PiiCategory       `json:"piiCategories,omitempty"`
+	ActionName    *string                       `json:"actionName,omitempty"`
+	Notes         *string                       `json:"notes,omitempty"`
+	Disabled      *bool                         `json:"disabled,omitempty"`
+	Signals       []common.ObservabilitySignal  `json:"signals,omitempty"`
+	PiiCategories []actionsv1alpha1.PiiCategory `json:"piiCategories,omitempty"`
 }
 
 // PiiMaskingSpecApplyConfiguration constructs a declarative configuration of the PiiMaskingSpec type for use with
@@ -75,7 +75,7 @@ func (b *PiiMaskingSpecApplyConfiguration) WithSignals(values ...common.Observab
 // WithPiiCategories adds the given value to the PiiCategories field in the declarative configuration
 // and returns the receiver, so that objects can be build by chaining "With" function invocations.
 // If called multiple times, values provided by each call will be appended to the PiiCategories field.
-func (b *PiiMaskingSpecApplyConfiguration) WithPiiCategories(values ...v1alpha1.PiiCategory) *PiiMaskingSpecApplyConfiguration {
+func (b *PiiMaskingSpecApplyConfiguration) WithPiiCategories(values ...actionsv1alpha1.PiiCategory) *PiiMaskingSpecApplyConfiguration {
 	for i := range values {
 		b.PiiCategories = append(b.PiiCategories, values[i])
 	}
diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/probabilisticsampler.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/probabilisticsampler.go
index 64d2d773e6..f3181a3f45 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/probabilisticsampler.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/probabilisticsampler.go
@@ -47,7 +47,7 @@ func ProbabilisticSampler(name, namespace string) *ProbabilisticSamplerApplyConf
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithKind(value string) *ProbabilisticSamplerApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithKind(value string) *Probabi
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithAPIVersion(value string) *ProbabilisticSamplerApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithAPIVersion(value string) *P
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithName(value string) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithName(value string) *Probabi
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithGenerateName(value string) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithGenerateName(value string)
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithNamespace(value string) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithNamespace(value string) *Pr
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithUID(value types.UID) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithUID(value types.UID) *Proba
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithResourceVersion(value string) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithResourceVersion(value strin
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithGeneration(value int64) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithGeneration(value int64) *Pr
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithCreationTimestamp(value met
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithDeletionTimestamp(value met
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *ProbabilisticSamplerApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithDeletionGracePeriodSeconds(
 // overwriting an existing map entries in Labels field with the same key.
 func (b *ProbabilisticSamplerApplyConfiguration) WithLabels(entries map[string]string) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithLabels(entries map[string]s
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *ProbabilisticSamplerApplyConfiguration) WithAnnotations(entries map[string]string) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithOwnerReferences(values ...*
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithOwnerReferences(values ...*
 func (b *ProbabilisticSamplerApplyConfiguration) WithFinalizers(values ...string) *ProbabilisticSamplerApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *ProbabilisticSamplerApplyConfiguration) WithStatus(value *Probabilistic
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *ProbabilisticSamplerApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/actions/applyconfiguration/actions/v1alpha1/renameattribute.go b/api/generated/actions/applyconfiguration/actions/v1alpha1/renameattribute.go
index 9329e10fc1..c3486f71d8 100644
--- a/api/generated/actions/applyconfiguration/actions/v1alpha1/renameattribute.go
+++ b/api/generated/actions/applyconfiguration/actions/v1alpha1/renameattribute.go
@@ -47,7 +47,7 @@ func RenameAttribute(name, namespace string) *RenameAttributeApplyConfiguration
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithKind(value string) *RenameAttributeApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *RenameAttributeApplyConfiguration) WithKind(value string) *RenameAttrib
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithAPIVersion(value string) *RenameAttributeApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *RenameAttributeApplyConfiguration) WithAPIVersion(value string) *Rename
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithName(value string) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *RenameAttributeApplyConfiguration) WithName(value string) *RenameAttrib
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithGenerateName(value string) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *RenameAttributeApplyConfiguration) WithGenerateName(value string) *Rena
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithNamespace(value string) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *RenameAttributeApplyConfiguration) WithNamespace(value string) *RenameA
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithUID(value types.UID) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *RenameAttributeApplyConfiguration) WithUID(value types.UID) *RenameAttr
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithResourceVersion(value string) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *RenameAttributeApplyConfiguration) WithResourceVersion(value string) *R
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithGeneration(value int64) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *RenameAttributeApplyConfiguration) WithGeneration(value int64) *RenameA
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithCreationTimestamp(value metav1.Time) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *RenameAttributeApplyConfiguration) WithCreationTimestamp(value metav1.T
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *RenameAttributeApplyConfiguration) WithDeletionTimestamp(value metav1.T
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *RenameAttributeApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *RenameAttributeApplyConfiguration) WithDeletionGracePeriodSeconds(value
 // overwriting an existing map entries in Labels field with the same key.
 func (b *RenameAttributeApplyConfiguration) WithLabels(entries map[string]string) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *RenameAttributeApplyConfiguration) WithLabels(entries map[string]string
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *RenameAttributeApplyConfiguration) WithAnnotations(entries map[string]string) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *RenameAttributeApplyConfiguration) WithOwnerReferences(values ...*v1.Ow
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *RenameAttributeApplyConfiguration) WithOwnerReferences(values ...*v1.Ow
 func (b *RenameAttributeApplyConfiguration) WithFinalizers(values ...string) *RenameAttributeApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *RenameAttributeApplyConfiguration) WithStatus(value *RenameAttributeSta
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *RenameAttributeApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/actions/applyconfiguration/internal/internal.go b/api/generated/actions/applyconfiguration/internal/internal.go
index 57dabcd595..b171e7594d 100644
--- a/api/generated/actions/applyconfiguration/internal/internal.go
+++ b/api/generated/actions/applyconfiguration/internal/internal.go
@@ -18,8 +18,8 @@ limitations under the License.
 package internal
 
 import (
-	"fmt"
-	"sync"
+	fmt "fmt"
+	sync "sync"
 
 	typed "sigs.k8s.io/structured-merge-diff/v4/typed"
 )
diff --git a/api/generated/actions/clientset/versioned/clientset.go b/api/generated/actions/clientset/versioned/clientset.go
index c399112836..a489084c52 100644
--- a/api/generated/actions/clientset/versioned/clientset.go
+++ b/api/generated/actions/clientset/versioned/clientset.go
@@ -18,8 +18,8 @@ limitations under the License.
 package versioned
 
 import (
-	"fmt"
-	"net/http"
+	fmt "fmt"
+	http "net/http"
 
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
 	discovery "k8s.io/client-go/discovery"
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/actions_client.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/actions_client.go
index 530d3fbcd3..06e0e76260 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/actions_client.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/actions_client.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"net/http"
+	http "net/http"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 
@@ -114,10 +114,10 @@ func New(c rest.Interface) *ActionsV1alpha1Client {
 }
 
 func setConfigDefaults(config *rest.Config) error {
-	gv := v1alpha1.SchemeGroupVersion
+	gv := actionsv1alpha1.SchemeGroupVersion
 	config.GroupVersion = &gv
 	config.APIPath = "/apis"
-	config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
+	config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion()
 
 	if config.UserAgent == "" {
 		config.UserAgent = rest.DefaultKubernetesUserAgent()
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/addclusterinfo.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/addclusterinfo.go
index 58ea5ebd2d..7e62dc1f40 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/addclusterinfo.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/addclusterinfo.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	applyconfigurationactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -37,36 +37,37 @@ type AddClusterInfosGetter interface {
 
 // AddClusterInfoInterface has methods to work with AddClusterInfo resources.
 type AddClusterInfoInterface interface {
-	Create(ctx context.Context, addClusterInfo *v1alpha1.AddClusterInfo, opts v1.CreateOptions) (*v1alpha1.AddClusterInfo, error)
-	Update(ctx context.Context, addClusterInfo *v1alpha1.AddClusterInfo, opts v1.UpdateOptions) (*v1alpha1.AddClusterInfo, error)
+	Create(ctx context.Context, addClusterInfo *actionsv1alpha1.AddClusterInfo, opts v1.CreateOptions) (*actionsv1alpha1.AddClusterInfo, error)
+	Update(ctx context.Context, addClusterInfo *actionsv1alpha1.AddClusterInfo, opts v1.UpdateOptions) (*actionsv1alpha1.AddClusterInfo, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, addClusterInfo *v1alpha1.AddClusterInfo, opts v1.UpdateOptions) (*v1alpha1.AddClusterInfo, error)
+	UpdateStatus(ctx context.Context, addClusterInfo *actionsv1alpha1.AddClusterInfo, opts v1.UpdateOptions) (*actionsv1alpha1.AddClusterInfo, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.AddClusterInfo, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.AddClusterInfoList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*actionsv1alpha1.AddClusterInfo, error)
+	List(ctx context.Context, opts v1.ListOptions) (*actionsv1alpha1.AddClusterInfoList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.AddClusterInfo, err error)
-	Apply(ctx context.Context, addClusterInfo *actionsv1alpha1.AddClusterInfoApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.AddClusterInfo, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *actionsv1alpha1.AddClusterInfo, err error)
+	Apply(ctx context.Context, addClusterInfo *applyconfigurationactionsv1alpha1.AddClusterInfoApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.AddClusterInfo, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, addClusterInfo *actionsv1alpha1.AddClusterInfoApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.AddClusterInfo, err error)
+	ApplyStatus(ctx context.Context, addClusterInfo *applyconfigurationactionsv1alpha1.AddClusterInfoApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.AddClusterInfo, err error)
 	AddClusterInfoExpansion
 }
 
 // addClusterInfos implements AddClusterInfoInterface
 type addClusterInfos struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.AddClusterInfo, *v1alpha1.AddClusterInfoList, *actionsv1alpha1.AddClusterInfoApplyConfiguration]
+	*gentype.ClientWithListAndApply[*actionsv1alpha1.AddClusterInfo, *actionsv1alpha1.AddClusterInfoList, *applyconfigurationactionsv1alpha1.AddClusterInfoApplyConfiguration]
 }
 
 // newAddClusterInfos returns a AddClusterInfos
 func newAddClusterInfos(c *ActionsV1alpha1Client, namespace string) *addClusterInfos {
 	return &addClusterInfos{
-		gentype.NewClientWithListAndApply[*v1alpha1.AddClusterInfo, *v1alpha1.AddClusterInfoList, *actionsv1alpha1.AddClusterInfoApplyConfiguration](
+		gentype.NewClientWithListAndApply[*actionsv1alpha1.AddClusterInfo, *actionsv1alpha1.AddClusterInfoList, *applyconfigurationactionsv1alpha1.AddClusterInfoApplyConfiguration](
 			"addclusterinfos",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.AddClusterInfo { return &v1alpha1.AddClusterInfo{} },
-			func() *v1alpha1.AddClusterInfoList { return &v1alpha1.AddClusterInfoList{} }),
+			func() *actionsv1alpha1.AddClusterInfo { return &actionsv1alpha1.AddClusterInfo{} },
+			func() *actionsv1alpha1.AddClusterInfoList { return &actionsv1alpha1.AddClusterInfoList{} },
+		),
 	}
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/deleteattribute.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/deleteattribute.go
index dbd8175440..2ec9c6674d 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/deleteattribute.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/deleteattribute.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	applyconfigurationactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -37,36 +37,37 @@ type DeleteAttributesGetter interface {
 
 // DeleteAttributeInterface has methods to work with DeleteAttribute resources.
 type DeleteAttributeInterface interface {
-	Create(ctx context.Context, deleteAttribute *v1alpha1.DeleteAttribute, opts v1.CreateOptions) (*v1alpha1.DeleteAttribute, error)
-	Update(ctx context.Context, deleteAttribute *v1alpha1.DeleteAttribute, opts v1.UpdateOptions) (*v1alpha1.DeleteAttribute, error)
+	Create(ctx context.Context, deleteAttribute *actionsv1alpha1.DeleteAttribute, opts v1.CreateOptions) (*actionsv1alpha1.DeleteAttribute, error)
+	Update(ctx context.Context, deleteAttribute *actionsv1alpha1.DeleteAttribute, opts v1.UpdateOptions) (*actionsv1alpha1.DeleteAttribute, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, deleteAttribute *v1alpha1.DeleteAttribute, opts v1.UpdateOptions) (*v1alpha1.DeleteAttribute, error)
+	UpdateStatus(ctx context.Context, deleteAttribute *actionsv1alpha1.DeleteAttribute, opts v1.UpdateOptions) (*actionsv1alpha1.DeleteAttribute, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.DeleteAttribute, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.DeleteAttributeList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*actionsv1alpha1.DeleteAttribute, error)
+	List(ctx context.Context, opts v1.ListOptions) (*actionsv1alpha1.DeleteAttributeList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.DeleteAttribute, err error)
-	Apply(ctx context.Context, deleteAttribute *actionsv1alpha1.DeleteAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.DeleteAttribute, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *actionsv1alpha1.DeleteAttribute, err error)
+	Apply(ctx context.Context, deleteAttribute *applyconfigurationactionsv1alpha1.DeleteAttributeApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.DeleteAttribute, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, deleteAttribute *actionsv1alpha1.DeleteAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.DeleteAttribute, err error)
+	ApplyStatus(ctx context.Context, deleteAttribute *applyconfigurationactionsv1alpha1.DeleteAttributeApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.DeleteAttribute, err error)
 	DeleteAttributeExpansion
 }
 
 // deleteAttributes implements DeleteAttributeInterface
 type deleteAttributes struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.DeleteAttribute, *v1alpha1.DeleteAttributeList, *actionsv1alpha1.DeleteAttributeApplyConfiguration]
+	*gentype.ClientWithListAndApply[*actionsv1alpha1.DeleteAttribute, *actionsv1alpha1.DeleteAttributeList, *applyconfigurationactionsv1alpha1.DeleteAttributeApplyConfiguration]
 }
 
 // newDeleteAttributes returns a DeleteAttributes
 func newDeleteAttributes(c *ActionsV1alpha1Client, namespace string) *deleteAttributes {
 	return &deleteAttributes{
-		gentype.NewClientWithListAndApply[*v1alpha1.DeleteAttribute, *v1alpha1.DeleteAttributeList, *actionsv1alpha1.DeleteAttributeApplyConfiguration](
+		gentype.NewClientWithListAndApply[*actionsv1alpha1.DeleteAttribute, *actionsv1alpha1.DeleteAttributeList, *applyconfigurationactionsv1alpha1.DeleteAttributeApplyConfiguration](
 			"deleteattributes",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.DeleteAttribute { return &v1alpha1.DeleteAttribute{} },
-			func() *v1alpha1.DeleteAttributeList { return &v1alpha1.DeleteAttributeList{} }),
+			func() *actionsv1alpha1.DeleteAttribute { return &actionsv1alpha1.DeleteAttribute{} },
+			func() *actionsv1alpha1.DeleteAttributeList { return &actionsv1alpha1.DeleteAttributeList{} },
+		),
 	}
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/errorsampler.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/errorsampler.go
index 0c882026e3..8ed5f16d5e 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/errorsampler.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/errorsampler.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	applyconfigurationactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -37,36 +37,37 @@ type ErrorSamplersGetter interface {
 
 // ErrorSamplerInterface has methods to work with ErrorSampler resources.
 type ErrorSamplerInterface interface {
-	Create(ctx context.Context, errorSampler *v1alpha1.ErrorSampler, opts v1.CreateOptions) (*v1alpha1.ErrorSampler, error)
-	Update(ctx context.Context, errorSampler *v1alpha1.ErrorSampler, opts v1.UpdateOptions) (*v1alpha1.ErrorSampler, error)
+	Create(ctx context.Context, errorSampler *actionsv1alpha1.ErrorSampler, opts v1.CreateOptions) (*actionsv1alpha1.ErrorSampler, error)
+	Update(ctx context.Context, errorSampler *actionsv1alpha1.ErrorSampler, opts v1.UpdateOptions) (*actionsv1alpha1.ErrorSampler, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, errorSampler *v1alpha1.ErrorSampler, opts v1.UpdateOptions) (*v1alpha1.ErrorSampler, error)
+	UpdateStatus(ctx context.Context, errorSampler *actionsv1alpha1.ErrorSampler, opts v1.UpdateOptions) (*actionsv1alpha1.ErrorSampler, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.ErrorSampler, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.ErrorSamplerList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*actionsv1alpha1.ErrorSampler, error)
+	List(ctx context.Context, opts v1.ListOptions) (*actionsv1alpha1.ErrorSamplerList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ErrorSampler, err error)
-	Apply(ctx context.Context, errorSampler *actionsv1alpha1.ErrorSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ErrorSampler, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *actionsv1alpha1.ErrorSampler, err error)
+	Apply(ctx context.Context, errorSampler *applyconfigurationactionsv1alpha1.ErrorSamplerApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.ErrorSampler, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, errorSampler *actionsv1alpha1.ErrorSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ErrorSampler, err error)
+	ApplyStatus(ctx context.Context, errorSampler *applyconfigurationactionsv1alpha1.ErrorSamplerApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.ErrorSampler, err error)
 	ErrorSamplerExpansion
 }
 
 // errorSamplers implements ErrorSamplerInterface
 type errorSamplers struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.ErrorSampler, *v1alpha1.ErrorSamplerList, *actionsv1alpha1.ErrorSamplerApplyConfiguration]
+	*gentype.ClientWithListAndApply[*actionsv1alpha1.ErrorSampler, *actionsv1alpha1.ErrorSamplerList, *applyconfigurationactionsv1alpha1.ErrorSamplerApplyConfiguration]
 }
 
 // newErrorSamplers returns a ErrorSamplers
 func newErrorSamplers(c *ActionsV1alpha1Client, namespace string) *errorSamplers {
 	return &errorSamplers{
-		gentype.NewClientWithListAndApply[*v1alpha1.ErrorSampler, *v1alpha1.ErrorSamplerList, *actionsv1alpha1.ErrorSamplerApplyConfiguration](
+		gentype.NewClientWithListAndApply[*actionsv1alpha1.ErrorSampler, *actionsv1alpha1.ErrorSamplerList, *applyconfigurationactionsv1alpha1.ErrorSamplerApplyConfiguration](
 			"errorsamplers",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.ErrorSampler { return &v1alpha1.ErrorSampler{} },
-			func() *v1alpha1.ErrorSamplerList { return &v1alpha1.ErrorSamplerList{} }),
+			func() *actionsv1alpha1.ErrorSampler { return &actionsv1alpha1.ErrorSampler{} },
+			func() *actionsv1alpha1.ErrorSamplerList { return &actionsv1alpha1.ErrorSamplerList{} },
+		),
 	}
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_actions_client.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_actions_client.go
index 8db5c31b32..561fb6de52 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_actions_client.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_actions_client.go
@@ -28,31 +28,31 @@ type FakeActionsV1alpha1 struct {
 }
 
 func (c *FakeActionsV1alpha1) AddClusterInfos(namespace string) v1alpha1.AddClusterInfoInterface {
-	return &FakeAddClusterInfos{c, namespace}
+	return newFakeAddClusterInfos(c, namespace)
 }
 
 func (c *FakeActionsV1alpha1) DeleteAttributes(namespace string) v1alpha1.DeleteAttributeInterface {
-	return &FakeDeleteAttributes{c, namespace}
+	return newFakeDeleteAttributes(c, namespace)
 }
 
 func (c *FakeActionsV1alpha1) ErrorSamplers(namespace string) v1alpha1.ErrorSamplerInterface {
-	return &FakeErrorSamplers{c, namespace}
+	return newFakeErrorSamplers(c, namespace)
 }
 
 func (c *FakeActionsV1alpha1) LatencySamplers(namespace string) v1alpha1.LatencySamplerInterface {
-	return &FakeLatencySamplers{c, namespace}
+	return newFakeLatencySamplers(c, namespace)
 }
 
 func (c *FakeActionsV1alpha1) PiiMaskings(namespace string) v1alpha1.PiiMaskingInterface {
-	return &FakePiiMaskings{c, namespace}
+	return newFakePiiMaskings(c, namespace)
 }
 
 func (c *FakeActionsV1alpha1) ProbabilisticSamplers(namespace string) v1alpha1.ProbabilisticSamplerInterface {
-	return &FakeProbabilisticSamplers{c, namespace}
+	return newFakeProbabilisticSamplers(c, namespace)
 }
 
 func (c *FakeActionsV1alpha1) RenameAttributes(namespace string) v1alpha1.RenameAttributeInterface {
-	return &FakeRenameAttributes{c, namespace}
+	return newFakeRenameAttributes(c, namespace)
 }
 
 // RESTClient returns a RESTClient that is used to communicate
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_addclusterinfo.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_addclusterinfo.go
index 5cc9ae5146..90e6d9e4cb 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_addclusterinfo.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_addclusterinfo.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	typedactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeAddClusterInfos implements AddClusterInfoInterface
-type FakeAddClusterInfos struct {
+// fakeAddClusterInfos implements AddClusterInfoInterface
+type fakeAddClusterInfos struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.AddClusterInfo, *v1alpha1.AddClusterInfoList, *actionsv1alpha1.AddClusterInfoApplyConfiguration]
 	Fake *FakeActionsV1alpha1
-	ns   string
-}
-
-var addclusterinfosResource = v1alpha1.SchemeGroupVersion.WithResource("addclusterinfos")
-
-var addclusterinfosKind = v1alpha1.SchemeGroupVersion.WithKind("AddClusterInfo")
-
-// Get takes name of the addClusterInfo, and returns the corresponding addClusterInfo object, and an error if there is any.
-func (c *FakeAddClusterInfos) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.AddClusterInfo, err error) {
-	emptyResult := &v1alpha1.AddClusterInfo{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(addclusterinfosResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.AddClusterInfo), err
-}
-
-// List takes label and field selectors, and returns the list of AddClusterInfos that match those selectors.
-func (c *FakeAddClusterInfos) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.AddClusterInfoList, err error) {
-	emptyResult := &v1alpha1.AddClusterInfoList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(addclusterinfosResource, addclusterinfosKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.AddClusterInfoList{ListMeta: obj.(*v1alpha1.AddClusterInfoList).ListMeta}
-	for _, item := range obj.(*v1alpha1.AddClusterInfoList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested addClusterInfos.
-func (c *FakeAddClusterInfos) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(addclusterinfosResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a addClusterInfo and creates it.  Returns the server's representation of the addClusterInfo, and an error, if there is any.
-func (c *FakeAddClusterInfos) Create(ctx context.Context, addClusterInfo *v1alpha1.AddClusterInfo, opts v1.CreateOptions) (result *v1alpha1.AddClusterInfo, err error) {
-	emptyResult := &v1alpha1.AddClusterInfo{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(addclusterinfosResource, c.ns, addClusterInfo, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.AddClusterInfo), err
-}
-
-// Update takes the representation of a addClusterInfo and updates it. Returns the server's representation of the addClusterInfo, and an error, if there is any.
-func (c *FakeAddClusterInfos) Update(ctx context.Context, addClusterInfo *v1alpha1.AddClusterInfo, opts v1.UpdateOptions) (result *v1alpha1.AddClusterInfo, err error) {
-	emptyResult := &v1alpha1.AddClusterInfo{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(addclusterinfosResource, c.ns, addClusterInfo, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.AddClusterInfo), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeAddClusterInfos) UpdateStatus(ctx context.Context, addClusterInfo *v1alpha1.AddClusterInfo, opts v1.UpdateOptions) (result *v1alpha1.AddClusterInfo, err error) {
-	emptyResult := &v1alpha1.AddClusterInfo{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(addclusterinfosResource, "status", c.ns, addClusterInfo, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.AddClusterInfo), err
-}
-
-// Delete takes name of the addClusterInfo and deletes it. Returns an error if one occurs.
-func (c *FakeAddClusterInfos) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(addclusterinfosResource, c.ns, name, opts), &v1alpha1.AddClusterInfo{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeAddClusterInfos) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(addclusterinfosResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.AddClusterInfoList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched addClusterInfo.
-func (c *FakeAddClusterInfos) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.AddClusterInfo, err error) {
-	emptyResult := &v1alpha1.AddClusterInfo{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(addclusterinfosResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.AddClusterInfo), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied addClusterInfo.
-func (c *FakeAddClusterInfos) Apply(ctx context.Context, addClusterInfo *actionsv1alpha1.AddClusterInfoApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.AddClusterInfo, err error) {
-	if addClusterInfo == nil {
-		return nil, fmt.Errorf("addClusterInfo provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(addClusterInfo)
-	if err != nil {
-		return nil, err
-	}
-	name := addClusterInfo.Name
-	if name == nil {
-		return nil, fmt.Errorf("addClusterInfo.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.AddClusterInfo{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(addclusterinfosResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.AddClusterInfo), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeAddClusterInfos) ApplyStatus(ctx context.Context, addClusterInfo *actionsv1alpha1.AddClusterInfoApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.AddClusterInfo, err error) {
-	if addClusterInfo == nil {
-		return nil, fmt.Errorf("addClusterInfo provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(addClusterInfo)
-	if err != nil {
-		return nil, err
-	}
-	name := addClusterInfo.Name
-	if name == nil {
-		return nil, fmt.Errorf("addClusterInfo.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.AddClusterInfo{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(addclusterinfosResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeAddClusterInfos(fake *FakeActionsV1alpha1, namespace string) typedactionsv1alpha1.AddClusterInfoInterface {
+	return &fakeAddClusterInfos{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.AddClusterInfo, *v1alpha1.AddClusterInfoList, *actionsv1alpha1.AddClusterInfoApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("addclusterinfos"),
+			v1alpha1.SchemeGroupVersion.WithKind("AddClusterInfo"),
+			func() *v1alpha1.AddClusterInfo { return &v1alpha1.AddClusterInfo{} },
+			func() *v1alpha1.AddClusterInfoList { return &v1alpha1.AddClusterInfoList{} },
+			func(dst, src *v1alpha1.AddClusterInfoList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.AddClusterInfoList) []*v1alpha1.AddClusterInfo {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.AddClusterInfoList, items []*v1alpha1.AddClusterInfo) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.AddClusterInfo), err
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_deleteattribute.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_deleteattribute.go
index 510bf3dc99..3c93801091 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_deleteattribute.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_deleteattribute.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	typedactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeDeleteAttributes implements DeleteAttributeInterface
-type FakeDeleteAttributes struct {
+// fakeDeleteAttributes implements DeleteAttributeInterface
+type fakeDeleteAttributes struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.DeleteAttribute, *v1alpha1.DeleteAttributeList, *actionsv1alpha1.DeleteAttributeApplyConfiguration]
 	Fake *FakeActionsV1alpha1
-	ns   string
-}
-
-var deleteattributesResource = v1alpha1.SchemeGroupVersion.WithResource("deleteattributes")
-
-var deleteattributesKind = v1alpha1.SchemeGroupVersion.WithKind("DeleteAttribute")
-
-// Get takes name of the deleteAttribute, and returns the corresponding deleteAttribute object, and an error if there is any.
-func (c *FakeDeleteAttributes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.DeleteAttribute, err error) {
-	emptyResult := &v1alpha1.DeleteAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(deleteattributesResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.DeleteAttribute), err
-}
-
-// List takes label and field selectors, and returns the list of DeleteAttributes that match those selectors.
-func (c *FakeDeleteAttributes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.DeleteAttributeList, err error) {
-	emptyResult := &v1alpha1.DeleteAttributeList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(deleteattributesResource, deleteattributesKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.DeleteAttributeList{ListMeta: obj.(*v1alpha1.DeleteAttributeList).ListMeta}
-	for _, item := range obj.(*v1alpha1.DeleteAttributeList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested deleteAttributes.
-func (c *FakeDeleteAttributes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(deleteattributesResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a deleteAttribute and creates it.  Returns the server's representation of the deleteAttribute, and an error, if there is any.
-func (c *FakeDeleteAttributes) Create(ctx context.Context, deleteAttribute *v1alpha1.DeleteAttribute, opts v1.CreateOptions) (result *v1alpha1.DeleteAttribute, err error) {
-	emptyResult := &v1alpha1.DeleteAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(deleteattributesResource, c.ns, deleteAttribute, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.DeleteAttribute), err
-}
-
-// Update takes the representation of a deleteAttribute and updates it. Returns the server's representation of the deleteAttribute, and an error, if there is any.
-func (c *FakeDeleteAttributes) Update(ctx context.Context, deleteAttribute *v1alpha1.DeleteAttribute, opts v1.UpdateOptions) (result *v1alpha1.DeleteAttribute, err error) {
-	emptyResult := &v1alpha1.DeleteAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(deleteattributesResource, c.ns, deleteAttribute, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.DeleteAttribute), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeDeleteAttributes) UpdateStatus(ctx context.Context, deleteAttribute *v1alpha1.DeleteAttribute, opts v1.UpdateOptions) (result *v1alpha1.DeleteAttribute, err error) {
-	emptyResult := &v1alpha1.DeleteAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(deleteattributesResource, "status", c.ns, deleteAttribute, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.DeleteAttribute), err
-}
-
-// Delete takes name of the deleteAttribute and deletes it. Returns an error if one occurs.
-func (c *FakeDeleteAttributes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(deleteattributesResource, c.ns, name, opts), &v1alpha1.DeleteAttribute{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeDeleteAttributes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(deleteattributesResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.DeleteAttributeList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched deleteAttribute.
-func (c *FakeDeleteAttributes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.DeleteAttribute, err error) {
-	emptyResult := &v1alpha1.DeleteAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(deleteattributesResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.DeleteAttribute), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied deleteAttribute.
-func (c *FakeDeleteAttributes) Apply(ctx context.Context, deleteAttribute *actionsv1alpha1.DeleteAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.DeleteAttribute, err error) {
-	if deleteAttribute == nil {
-		return nil, fmt.Errorf("deleteAttribute provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(deleteAttribute)
-	if err != nil {
-		return nil, err
-	}
-	name := deleteAttribute.Name
-	if name == nil {
-		return nil, fmt.Errorf("deleteAttribute.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.DeleteAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(deleteattributesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.DeleteAttribute), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeDeleteAttributes) ApplyStatus(ctx context.Context, deleteAttribute *actionsv1alpha1.DeleteAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.DeleteAttribute, err error) {
-	if deleteAttribute == nil {
-		return nil, fmt.Errorf("deleteAttribute provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(deleteAttribute)
-	if err != nil {
-		return nil, err
-	}
-	name := deleteAttribute.Name
-	if name == nil {
-		return nil, fmt.Errorf("deleteAttribute.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.DeleteAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(deleteattributesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeDeleteAttributes(fake *FakeActionsV1alpha1, namespace string) typedactionsv1alpha1.DeleteAttributeInterface {
+	return &fakeDeleteAttributes{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.DeleteAttribute, *v1alpha1.DeleteAttributeList, *actionsv1alpha1.DeleteAttributeApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("deleteattributes"),
+			v1alpha1.SchemeGroupVersion.WithKind("DeleteAttribute"),
+			func() *v1alpha1.DeleteAttribute { return &v1alpha1.DeleteAttribute{} },
+			func() *v1alpha1.DeleteAttributeList { return &v1alpha1.DeleteAttributeList{} },
+			func(dst, src *v1alpha1.DeleteAttributeList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.DeleteAttributeList) []*v1alpha1.DeleteAttribute {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.DeleteAttributeList, items []*v1alpha1.DeleteAttribute) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.DeleteAttribute), err
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_errorsampler.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_errorsampler.go
index d10e975776..afd0da0b74 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_errorsampler.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_errorsampler.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	typedactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeErrorSamplers implements ErrorSamplerInterface
-type FakeErrorSamplers struct {
+// fakeErrorSamplers implements ErrorSamplerInterface
+type fakeErrorSamplers struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.ErrorSampler, *v1alpha1.ErrorSamplerList, *actionsv1alpha1.ErrorSamplerApplyConfiguration]
 	Fake *FakeActionsV1alpha1
-	ns   string
-}
-
-var errorsamplersResource = v1alpha1.SchemeGroupVersion.WithResource("errorsamplers")
-
-var errorsamplersKind = v1alpha1.SchemeGroupVersion.WithKind("ErrorSampler")
-
-// Get takes name of the errorSampler, and returns the corresponding errorSampler object, and an error if there is any.
-func (c *FakeErrorSamplers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ErrorSampler, err error) {
-	emptyResult := &v1alpha1.ErrorSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(errorsamplersResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ErrorSampler), err
-}
-
-// List takes label and field selectors, and returns the list of ErrorSamplers that match those selectors.
-func (c *FakeErrorSamplers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ErrorSamplerList, err error) {
-	emptyResult := &v1alpha1.ErrorSamplerList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(errorsamplersResource, errorsamplersKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.ErrorSamplerList{ListMeta: obj.(*v1alpha1.ErrorSamplerList).ListMeta}
-	for _, item := range obj.(*v1alpha1.ErrorSamplerList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested errorSamplers.
-func (c *FakeErrorSamplers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(errorsamplersResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a errorSampler and creates it.  Returns the server's representation of the errorSampler, and an error, if there is any.
-func (c *FakeErrorSamplers) Create(ctx context.Context, errorSampler *v1alpha1.ErrorSampler, opts v1.CreateOptions) (result *v1alpha1.ErrorSampler, err error) {
-	emptyResult := &v1alpha1.ErrorSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(errorsamplersResource, c.ns, errorSampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ErrorSampler), err
-}
-
-// Update takes the representation of a errorSampler and updates it. Returns the server's representation of the errorSampler, and an error, if there is any.
-func (c *FakeErrorSamplers) Update(ctx context.Context, errorSampler *v1alpha1.ErrorSampler, opts v1.UpdateOptions) (result *v1alpha1.ErrorSampler, err error) {
-	emptyResult := &v1alpha1.ErrorSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(errorsamplersResource, c.ns, errorSampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ErrorSampler), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeErrorSamplers) UpdateStatus(ctx context.Context, errorSampler *v1alpha1.ErrorSampler, opts v1.UpdateOptions) (result *v1alpha1.ErrorSampler, err error) {
-	emptyResult := &v1alpha1.ErrorSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(errorsamplersResource, "status", c.ns, errorSampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ErrorSampler), err
-}
-
-// Delete takes name of the errorSampler and deletes it. Returns an error if one occurs.
-func (c *FakeErrorSamplers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(errorsamplersResource, c.ns, name, opts), &v1alpha1.ErrorSampler{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeErrorSamplers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(errorsamplersResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.ErrorSamplerList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched errorSampler.
-func (c *FakeErrorSamplers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ErrorSampler, err error) {
-	emptyResult := &v1alpha1.ErrorSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(errorsamplersResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ErrorSampler), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied errorSampler.
-func (c *FakeErrorSamplers) Apply(ctx context.Context, errorSampler *actionsv1alpha1.ErrorSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ErrorSampler, err error) {
-	if errorSampler == nil {
-		return nil, fmt.Errorf("errorSampler provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(errorSampler)
-	if err != nil {
-		return nil, err
-	}
-	name := errorSampler.Name
-	if name == nil {
-		return nil, fmt.Errorf("errorSampler.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.ErrorSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(errorsamplersResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ErrorSampler), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeErrorSamplers) ApplyStatus(ctx context.Context, errorSampler *actionsv1alpha1.ErrorSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ErrorSampler, err error) {
-	if errorSampler == nil {
-		return nil, fmt.Errorf("errorSampler provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(errorSampler)
-	if err != nil {
-		return nil, err
-	}
-	name := errorSampler.Name
-	if name == nil {
-		return nil, fmt.Errorf("errorSampler.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.ErrorSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(errorsamplersResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeErrorSamplers(fake *FakeActionsV1alpha1, namespace string) typedactionsv1alpha1.ErrorSamplerInterface {
+	return &fakeErrorSamplers{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.ErrorSampler, *v1alpha1.ErrorSamplerList, *actionsv1alpha1.ErrorSamplerApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("errorsamplers"),
+			v1alpha1.SchemeGroupVersion.WithKind("ErrorSampler"),
+			func() *v1alpha1.ErrorSampler { return &v1alpha1.ErrorSampler{} },
+			func() *v1alpha1.ErrorSamplerList { return &v1alpha1.ErrorSamplerList{} },
+			func(dst, src *v1alpha1.ErrorSamplerList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.ErrorSamplerList) []*v1alpha1.ErrorSampler {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.ErrorSamplerList, items []*v1alpha1.ErrorSampler) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.ErrorSampler), err
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_latencysampler.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_latencysampler.go
index 5601ccc1f3..b5c13362de 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_latencysampler.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_latencysampler.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	typedactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeLatencySamplers implements LatencySamplerInterface
-type FakeLatencySamplers struct {
+// fakeLatencySamplers implements LatencySamplerInterface
+type fakeLatencySamplers struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.LatencySampler, *v1alpha1.LatencySamplerList, *actionsv1alpha1.LatencySamplerApplyConfiguration]
 	Fake *FakeActionsV1alpha1
-	ns   string
-}
-
-var latencysamplersResource = v1alpha1.SchemeGroupVersion.WithResource("latencysamplers")
-
-var latencysamplersKind = v1alpha1.SchemeGroupVersion.WithKind("LatencySampler")
-
-// Get takes name of the latencySampler, and returns the corresponding latencySampler object, and an error if there is any.
-func (c *FakeLatencySamplers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.LatencySampler, err error) {
-	emptyResult := &v1alpha1.LatencySampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(latencysamplersResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.LatencySampler), err
-}
-
-// List takes label and field selectors, and returns the list of LatencySamplers that match those selectors.
-func (c *FakeLatencySamplers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.LatencySamplerList, err error) {
-	emptyResult := &v1alpha1.LatencySamplerList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(latencysamplersResource, latencysamplersKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.LatencySamplerList{ListMeta: obj.(*v1alpha1.LatencySamplerList).ListMeta}
-	for _, item := range obj.(*v1alpha1.LatencySamplerList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested latencySamplers.
-func (c *FakeLatencySamplers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(latencysamplersResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a latencySampler and creates it.  Returns the server's representation of the latencySampler, and an error, if there is any.
-func (c *FakeLatencySamplers) Create(ctx context.Context, latencySampler *v1alpha1.LatencySampler, opts v1.CreateOptions) (result *v1alpha1.LatencySampler, err error) {
-	emptyResult := &v1alpha1.LatencySampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(latencysamplersResource, c.ns, latencySampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.LatencySampler), err
-}
-
-// Update takes the representation of a latencySampler and updates it. Returns the server's representation of the latencySampler, and an error, if there is any.
-func (c *FakeLatencySamplers) Update(ctx context.Context, latencySampler *v1alpha1.LatencySampler, opts v1.UpdateOptions) (result *v1alpha1.LatencySampler, err error) {
-	emptyResult := &v1alpha1.LatencySampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(latencysamplersResource, c.ns, latencySampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.LatencySampler), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeLatencySamplers) UpdateStatus(ctx context.Context, latencySampler *v1alpha1.LatencySampler, opts v1.UpdateOptions) (result *v1alpha1.LatencySampler, err error) {
-	emptyResult := &v1alpha1.LatencySampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(latencysamplersResource, "status", c.ns, latencySampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.LatencySampler), err
-}
-
-// Delete takes name of the latencySampler and deletes it. Returns an error if one occurs.
-func (c *FakeLatencySamplers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(latencysamplersResource, c.ns, name, opts), &v1alpha1.LatencySampler{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeLatencySamplers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(latencysamplersResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.LatencySamplerList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched latencySampler.
-func (c *FakeLatencySamplers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.LatencySampler, err error) {
-	emptyResult := &v1alpha1.LatencySampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(latencysamplersResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.LatencySampler), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied latencySampler.
-func (c *FakeLatencySamplers) Apply(ctx context.Context, latencySampler *actionsv1alpha1.LatencySamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LatencySampler, err error) {
-	if latencySampler == nil {
-		return nil, fmt.Errorf("latencySampler provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(latencySampler)
-	if err != nil {
-		return nil, err
-	}
-	name := latencySampler.Name
-	if name == nil {
-		return nil, fmt.Errorf("latencySampler.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.LatencySampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(latencysamplersResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.LatencySampler), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeLatencySamplers) ApplyStatus(ctx context.Context, latencySampler *actionsv1alpha1.LatencySamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LatencySampler, err error) {
-	if latencySampler == nil {
-		return nil, fmt.Errorf("latencySampler provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(latencySampler)
-	if err != nil {
-		return nil, err
-	}
-	name := latencySampler.Name
-	if name == nil {
-		return nil, fmt.Errorf("latencySampler.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.LatencySampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(latencysamplersResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeLatencySamplers(fake *FakeActionsV1alpha1, namespace string) typedactionsv1alpha1.LatencySamplerInterface {
+	return &fakeLatencySamplers{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.LatencySampler, *v1alpha1.LatencySamplerList, *actionsv1alpha1.LatencySamplerApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("latencysamplers"),
+			v1alpha1.SchemeGroupVersion.WithKind("LatencySampler"),
+			func() *v1alpha1.LatencySampler { return &v1alpha1.LatencySampler{} },
+			func() *v1alpha1.LatencySamplerList { return &v1alpha1.LatencySamplerList{} },
+			func(dst, src *v1alpha1.LatencySamplerList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.LatencySamplerList) []*v1alpha1.LatencySampler {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.LatencySamplerList, items []*v1alpha1.LatencySampler) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.LatencySampler), err
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_piimasking.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_piimasking.go
index 17f57b43a9..60d819f765 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_piimasking.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_piimasking.go
@@ -18,179 +18,33 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	typedactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakePiiMaskings implements PiiMaskingInterface
-type FakePiiMaskings struct {
+// fakePiiMaskings implements PiiMaskingInterface
+type fakePiiMaskings struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.PiiMasking, *v1alpha1.PiiMaskingList, *actionsv1alpha1.PiiMaskingApplyConfiguration]
 	Fake *FakeActionsV1alpha1
-	ns   string
-}
-
-var piimaskingsResource = v1alpha1.SchemeGroupVersion.WithResource("piimaskings")
-
-var piimaskingsKind = v1alpha1.SchemeGroupVersion.WithKind("PiiMasking")
-
-// Get takes name of the piiMasking, and returns the corresponding piiMasking object, and an error if there is any.
-func (c *FakePiiMaskings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PiiMasking, err error) {
-	emptyResult := &v1alpha1.PiiMasking{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(piimaskingsResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.PiiMasking), err
-}
-
-// List takes label and field selectors, and returns the list of PiiMaskings that match those selectors.
-func (c *FakePiiMaskings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PiiMaskingList, err error) {
-	emptyResult := &v1alpha1.PiiMaskingList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(piimaskingsResource, piimaskingsKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.PiiMaskingList{ListMeta: obj.(*v1alpha1.PiiMaskingList).ListMeta}
-	for _, item := range obj.(*v1alpha1.PiiMaskingList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested piiMaskings.
-func (c *FakePiiMaskings) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(piimaskingsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a piiMasking and creates it.  Returns the server's representation of the piiMasking, and an error, if there is any.
-func (c *FakePiiMaskings) Create(ctx context.Context, piiMasking *v1alpha1.PiiMasking, opts v1.CreateOptions) (result *v1alpha1.PiiMasking, err error) {
-	emptyResult := &v1alpha1.PiiMasking{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(piimaskingsResource, c.ns, piiMasking, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.PiiMasking), err
-}
-
-// Update takes the representation of a piiMasking and updates it. Returns the server's representation of the piiMasking, and an error, if there is any.
-func (c *FakePiiMaskings) Update(ctx context.Context, piiMasking *v1alpha1.PiiMasking, opts v1.UpdateOptions) (result *v1alpha1.PiiMasking, err error) {
-	emptyResult := &v1alpha1.PiiMasking{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(piimaskingsResource, c.ns, piiMasking, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.PiiMasking), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakePiiMaskings) UpdateStatus(ctx context.Context, piiMasking *v1alpha1.PiiMasking, opts v1.UpdateOptions) (result *v1alpha1.PiiMasking, err error) {
-	emptyResult := &v1alpha1.PiiMasking{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(piimaskingsResource, "status", c.ns, piiMasking, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.PiiMasking), err
-}
-
-// Delete takes name of the piiMasking and deletes it. Returns an error if one occurs.
-func (c *FakePiiMaskings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(piimaskingsResource, c.ns, name, opts), &v1alpha1.PiiMasking{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakePiiMaskings) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(piimaskingsResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.PiiMaskingList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched piiMasking.
-func (c *FakePiiMaskings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.PiiMasking, err error) {
-	emptyResult := &v1alpha1.PiiMasking{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(piimaskingsResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.PiiMasking), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied piiMasking.
-func (c *FakePiiMaskings) Apply(ctx context.Context, piiMasking *actionsv1alpha1.PiiMaskingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PiiMasking, err error) {
-	if piiMasking == nil {
-		return nil, fmt.Errorf("piiMasking provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(piiMasking)
-	if err != nil {
-		return nil, err
-	}
-	name := piiMasking.Name
-	if name == nil {
-		return nil, fmt.Errorf("piiMasking.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.PiiMasking{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(piimaskingsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.PiiMasking), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakePiiMaskings) ApplyStatus(ctx context.Context, piiMasking *actionsv1alpha1.PiiMaskingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PiiMasking, err error) {
-	if piiMasking == nil {
-		return nil, fmt.Errorf("piiMasking provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(piiMasking)
-	if err != nil {
-		return nil, err
-	}
-	name := piiMasking.Name
-	if name == nil {
-		return nil, fmt.Errorf("piiMasking.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.PiiMasking{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(piimaskingsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakePiiMaskings(fake *FakeActionsV1alpha1, namespace string) typedactionsv1alpha1.PiiMaskingInterface {
+	return &fakePiiMaskings{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.PiiMasking, *v1alpha1.PiiMaskingList, *actionsv1alpha1.PiiMaskingApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("piimaskings"),
+			v1alpha1.SchemeGroupVersion.WithKind("PiiMasking"),
+			func() *v1alpha1.PiiMasking { return &v1alpha1.PiiMasking{} },
+			func() *v1alpha1.PiiMaskingList { return &v1alpha1.PiiMaskingList{} },
+			func(dst, src *v1alpha1.PiiMaskingList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.PiiMaskingList) []*v1alpha1.PiiMasking { return gentype.ToPointerSlice(list.Items) },
+			func(list *v1alpha1.PiiMaskingList, items []*v1alpha1.PiiMasking) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.PiiMasking), err
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_probabilisticsampler.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_probabilisticsampler.go
index 60c1d0f18f..9ea826b5e4 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_probabilisticsampler.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_probabilisticsampler.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	typedactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeProbabilisticSamplers implements ProbabilisticSamplerInterface
-type FakeProbabilisticSamplers struct {
+// fakeProbabilisticSamplers implements ProbabilisticSamplerInterface
+type fakeProbabilisticSamplers struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.ProbabilisticSampler, *v1alpha1.ProbabilisticSamplerList, *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration]
 	Fake *FakeActionsV1alpha1
-	ns   string
-}
-
-var probabilisticsamplersResource = v1alpha1.SchemeGroupVersion.WithResource("probabilisticsamplers")
-
-var probabilisticsamplersKind = v1alpha1.SchemeGroupVersion.WithKind("ProbabilisticSampler")
-
-// Get takes name of the probabilisticSampler, and returns the corresponding probabilisticSampler object, and an error if there is any.
-func (c *FakeProbabilisticSamplers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ProbabilisticSampler, err error) {
-	emptyResult := &v1alpha1.ProbabilisticSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(probabilisticsamplersResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ProbabilisticSampler), err
-}
-
-// List takes label and field selectors, and returns the list of ProbabilisticSamplers that match those selectors.
-func (c *FakeProbabilisticSamplers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ProbabilisticSamplerList, err error) {
-	emptyResult := &v1alpha1.ProbabilisticSamplerList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(probabilisticsamplersResource, probabilisticsamplersKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.ProbabilisticSamplerList{ListMeta: obj.(*v1alpha1.ProbabilisticSamplerList).ListMeta}
-	for _, item := range obj.(*v1alpha1.ProbabilisticSamplerList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested probabilisticSamplers.
-func (c *FakeProbabilisticSamplers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(probabilisticsamplersResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a probabilisticSampler and creates it.  Returns the server's representation of the probabilisticSampler, and an error, if there is any.
-func (c *FakeProbabilisticSamplers) Create(ctx context.Context, probabilisticSampler *v1alpha1.ProbabilisticSampler, opts v1.CreateOptions) (result *v1alpha1.ProbabilisticSampler, err error) {
-	emptyResult := &v1alpha1.ProbabilisticSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(probabilisticsamplersResource, c.ns, probabilisticSampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ProbabilisticSampler), err
-}
-
-// Update takes the representation of a probabilisticSampler and updates it. Returns the server's representation of the probabilisticSampler, and an error, if there is any.
-func (c *FakeProbabilisticSamplers) Update(ctx context.Context, probabilisticSampler *v1alpha1.ProbabilisticSampler, opts v1.UpdateOptions) (result *v1alpha1.ProbabilisticSampler, err error) {
-	emptyResult := &v1alpha1.ProbabilisticSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(probabilisticsamplersResource, c.ns, probabilisticSampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ProbabilisticSampler), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeProbabilisticSamplers) UpdateStatus(ctx context.Context, probabilisticSampler *v1alpha1.ProbabilisticSampler, opts v1.UpdateOptions) (result *v1alpha1.ProbabilisticSampler, err error) {
-	emptyResult := &v1alpha1.ProbabilisticSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(probabilisticsamplersResource, "status", c.ns, probabilisticSampler, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ProbabilisticSampler), err
-}
-
-// Delete takes name of the probabilisticSampler and deletes it. Returns an error if one occurs.
-func (c *FakeProbabilisticSamplers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(probabilisticsamplersResource, c.ns, name, opts), &v1alpha1.ProbabilisticSampler{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeProbabilisticSamplers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(probabilisticsamplersResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.ProbabilisticSamplerList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched probabilisticSampler.
-func (c *FakeProbabilisticSamplers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ProbabilisticSampler, err error) {
-	emptyResult := &v1alpha1.ProbabilisticSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(probabilisticsamplersResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ProbabilisticSampler), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied probabilisticSampler.
-func (c *FakeProbabilisticSamplers) Apply(ctx context.Context, probabilisticSampler *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ProbabilisticSampler, err error) {
-	if probabilisticSampler == nil {
-		return nil, fmt.Errorf("probabilisticSampler provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(probabilisticSampler)
-	if err != nil {
-		return nil, err
-	}
-	name := probabilisticSampler.Name
-	if name == nil {
-		return nil, fmt.Errorf("probabilisticSampler.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.ProbabilisticSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(probabilisticsamplersResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.ProbabilisticSampler), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeProbabilisticSamplers) ApplyStatus(ctx context.Context, probabilisticSampler *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ProbabilisticSampler, err error) {
-	if probabilisticSampler == nil {
-		return nil, fmt.Errorf("probabilisticSampler provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(probabilisticSampler)
-	if err != nil {
-		return nil, err
-	}
-	name := probabilisticSampler.Name
-	if name == nil {
-		return nil, fmt.Errorf("probabilisticSampler.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.ProbabilisticSampler{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(probabilisticsamplersResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeProbabilisticSamplers(fake *FakeActionsV1alpha1, namespace string) typedactionsv1alpha1.ProbabilisticSamplerInterface {
+	return &fakeProbabilisticSamplers{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.ProbabilisticSampler, *v1alpha1.ProbabilisticSamplerList, *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("probabilisticsamplers"),
+			v1alpha1.SchemeGroupVersion.WithKind("ProbabilisticSampler"),
+			func() *v1alpha1.ProbabilisticSampler { return &v1alpha1.ProbabilisticSampler{} },
+			func() *v1alpha1.ProbabilisticSamplerList { return &v1alpha1.ProbabilisticSamplerList{} },
+			func(dst, src *v1alpha1.ProbabilisticSamplerList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.ProbabilisticSamplerList) []*v1alpha1.ProbabilisticSampler {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.ProbabilisticSamplerList, items []*v1alpha1.ProbabilisticSampler) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.ProbabilisticSampler), err
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_renameattribute.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_renameattribute.go
index 0552f3a358..e3b8be9c4f 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_renameattribute.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/fake/fake_renameattribute.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	typedactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/typed/actions/v1alpha1"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeRenameAttributes implements RenameAttributeInterface
-type FakeRenameAttributes struct {
+// fakeRenameAttributes implements RenameAttributeInterface
+type fakeRenameAttributes struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.RenameAttribute, *v1alpha1.RenameAttributeList, *actionsv1alpha1.RenameAttributeApplyConfiguration]
 	Fake *FakeActionsV1alpha1
-	ns   string
-}
-
-var renameattributesResource = v1alpha1.SchemeGroupVersion.WithResource("renameattributes")
-
-var renameattributesKind = v1alpha1.SchemeGroupVersion.WithKind("RenameAttribute")
-
-// Get takes name of the renameAttribute, and returns the corresponding renameAttribute object, and an error if there is any.
-func (c *FakeRenameAttributes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.RenameAttribute, err error) {
-	emptyResult := &v1alpha1.RenameAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(renameattributesResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.RenameAttribute), err
-}
-
-// List takes label and field selectors, and returns the list of RenameAttributes that match those selectors.
-func (c *FakeRenameAttributes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.RenameAttributeList, err error) {
-	emptyResult := &v1alpha1.RenameAttributeList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(renameattributesResource, renameattributesKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.RenameAttributeList{ListMeta: obj.(*v1alpha1.RenameAttributeList).ListMeta}
-	for _, item := range obj.(*v1alpha1.RenameAttributeList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested renameAttributes.
-func (c *FakeRenameAttributes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(renameattributesResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a renameAttribute and creates it.  Returns the server's representation of the renameAttribute, and an error, if there is any.
-func (c *FakeRenameAttributes) Create(ctx context.Context, renameAttribute *v1alpha1.RenameAttribute, opts v1.CreateOptions) (result *v1alpha1.RenameAttribute, err error) {
-	emptyResult := &v1alpha1.RenameAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(renameattributesResource, c.ns, renameAttribute, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.RenameAttribute), err
-}
-
-// Update takes the representation of a renameAttribute and updates it. Returns the server's representation of the renameAttribute, and an error, if there is any.
-func (c *FakeRenameAttributes) Update(ctx context.Context, renameAttribute *v1alpha1.RenameAttribute, opts v1.UpdateOptions) (result *v1alpha1.RenameAttribute, err error) {
-	emptyResult := &v1alpha1.RenameAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(renameattributesResource, c.ns, renameAttribute, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.RenameAttribute), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeRenameAttributes) UpdateStatus(ctx context.Context, renameAttribute *v1alpha1.RenameAttribute, opts v1.UpdateOptions) (result *v1alpha1.RenameAttribute, err error) {
-	emptyResult := &v1alpha1.RenameAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(renameattributesResource, "status", c.ns, renameAttribute, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.RenameAttribute), err
-}
-
-// Delete takes name of the renameAttribute and deletes it. Returns an error if one occurs.
-func (c *FakeRenameAttributes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(renameattributesResource, c.ns, name, opts), &v1alpha1.RenameAttribute{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeRenameAttributes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(renameattributesResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.RenameAttributeList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched renameAttribute.
-func (c *FakeRenameAttributes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.RenameAttribute, err error) {
-	emptyResult := &v1alpha1.RenameAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(renameattributesResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.RenameAttribute), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied renameAttribute.
-func (c *FakeRenameAttributes) Apply(ctx context.Context, renameAttribute *actionsv1alpha1.RenameAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.RenameAttribute, err error) {
-	if renameAttribute == nil {
-		return nil, fmt.Errorf("renameAttribute provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(renameAttribute)
-	if err != nil {
-		return nil, err
-	}
-	name := renameAttribute.Name
-	if name == nil {
-		return nil, fmt.Errorf("renameAttribute.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.RenameAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(renameattributesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.RenameAttribute), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeRenameAttributes) ApplyStatus(ctx context.Context, renameAttribute *actionsv1alpha1.RenameAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.RenameAttribute, err error) {
-	if renameAttribute == nil {
-		return nil, fmt.Errorf("renameAttribute provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(renameAttribute)
-	if err != nil {
-		return nil, err
-	}
-	name := renameAttribute.Name
-	if name == nil {
-		return nil, fmt.Errorf("renameAttribute.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.RenameAttribute{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(renameattributesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeRenameAttributes(fake *FakeActionsV1alpha1, namespace string) typedactionsv1alpha1.RenameAttributeInterface {
+	return &fakeRenameAttributes{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.RenameAttribute, *v1alpha1.RenameAttributeList, *actionsv1alpha1.RenameAttributeApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("renameattributes"),
+			v1alpha1.SchemeGroupVersion.WithKind("RenameAttribute"),
+			func() *v1alpha1.RenameAttribute { return &v1alpha1.RenameAttribute{} },
+			func() *v1alpha1.RenameAttributeList { return &v1alpha1.RenameAttributeList{} },
+			func(dst, src *v1alpha1.RenameAttributeList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.RenameAttributeList) []*v1alpha1.RenameAttribute {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.RenameAttributeList, items []*v1alpha1.RenameAttribute) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.RenameAttribute), err
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/latencysampler.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/latencysampler.go
index f353daf282..ae374a81ab 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/latencysampler.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/latencysampler.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	applyconfigurationactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -37,36 +37,37 @@ type LatencySamplersGetter interface {
 
 // LatencySamplerInterface has methods to work with LatencySampler resources.
 type LatencySamplerInterface interface {
-	Create(ctx context.Context, latencySampler *v1alpha1.LatencySampler, opts v1.CreateOptions) (*v1alpha1.LatencySampler, error)
-	Update(ctx context.Context, latencySampler *v1alpha1.LatencySampler, opts v1.UpdateOptions) (*v1alpha1.LatencySampler, error)
+	Create(ctx context.Context, latencySampler *actionsv1alpha1.LatencySampler, opts v1.CreateOptions) (*actionsv1alpha1.LatencySampler, error)
+	Update(ctx context.Context, latencySampler *actionsv1alpha1.LatencySampler, opts v1.UpdateOptions) (*actionsv1alpha1.LatencySampler, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, latencySampler *v1alpha1.LatencySampler, opts v1.UpdateOptions) (*v1alpha1.LatencySampler, error)
+	UpdateStatus(ctx context.Context, latencySampler *actionsv1alpha1.LatencySampler, opts v1.UpdateOptions) (*actionsv1alpha1.LatencySampler, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.LatencySampler, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.LatencySamplerList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*actionsv1alpha1.LatencySampler, error)
+	List(ctx context.Context, opts v1.ListOptions) (*actionsv1alpha1.LatencySamplerList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.LatencySampler, err error)
-	Apply(ctx context.Context, latencySampler *actionsv1alpha1.LatencySamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LatencySampler, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *actionsv1alpha1.LatencySampler, err error)
+	Apply(ctx context.Context, latencySampler *applyconfigurationactionsv1alpha1.LatencySamplerApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.LatencySampler, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, latencySampler *actionsv1alpha1.LatencySamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LatencySampler, err error)
+	ApplyStatus(ctx context.Context, latencySampler *applyconfigurationactionsv1alpha1.LatencySamplerApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.LatencySampler, err error)
 	LatencySamplerExpansion
 }
 
 // latencySamplers implements LatencySamplerInterface
 type latencySamplers struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.LatencySampler, *v1alpha1.LatencySamplerList, *actionsv1alpha1.LatencySamplerApplyConfiguration]
+	*gentype.ClientWithListAndApply[*actionsv1alpha1.LatencySampler, *actionsv1alpha1.LatencySamplerList, *applyconfigurationactionsv1alpha1.LatencySamplerApplyConfiguration]
 }
 
 // newLatencySamplers returns a LatencySamplers
 func newLatencySamplers(c *ActionsV1alpha1Client, namespace string) *latencySamplers {
 	return &latencySamplers{
-		gentype.NewClientWithListAndApply[*v1alpha1.LatencySampler, *v1alpha1.LatencySamplerList, *actionsv1alpha1.LatencySamplerApplyConfiguration](
+		gentype.NewClientWithListAndApply[*actionsv1alpha1.LatencySampler, *actionsv1alpha1.LatencySamplerList, *applyconfigurationactionsv1alpha1.LatencySamplerApplyConfiguration](
 			"latencysamplers",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.LatencySampler { return &v1alpha1.LatencySampler{} },
-			func() *v1alpha1.LatencySamplerList { return &v1alpha1.LatencySamplerList{} }),
+			func() *actionsv1alpha1.LatencySampler { return &actionsv1alpha1.LatencySampler{} },
+			func() *actionsv1alpha1.LatencySamplerList { return &actionsv1alpha1.LatencySamplerList{} },
+		),
 	}
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/piimasking.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/piimasking.go
index 8b016274b2..46cb89fbde 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/piimasking.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/piimasking.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	applyconfigurationactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -37,36 +37,37 @@ type PiiMaskingsGetter interface {
 
 // PiiMaskingInterface has methods to work with PiiMasking resources.
 type PiiMaskingInterface interface {
-	Create(ctx context.Context, piiMasking *v1alpha1.PiiMasking, opts v1.CreateOptions) (*v1alpha1.PiiMasking, error)
-	Update(ctx context.Context, piiMasking *v1alpha1.PiiMasking, opts v1.UpdateOptions) (*v1alpha1.PiiMasking, error)
+	Create(ctx context.Context, piiMasking *actionsv1alpha1.PiiMasking, opts v1.CreateOptions) (*actionsv1alpha1.PiiMasking, error)
+	Update(ctx context.Context, piiMasking *actionsv1alpha1.PiiMasking, opts v1.UpdateOptions) (*actionsv1alpha1.PiiMasking, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, piiMasking *v1alpha1.PiiMasking, opts v1.UpdateOptions) (*v1alpha1.PiiMasking, error)
+	UpdateStatus(ctx context.Context, piiMasking *actionsv1alpha1.PiiMasking, opts v1.UpdateOptions) (*actionsv1alpha1.PiiMasking, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.PiiMasking, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.PiiMaskingList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*actionsv1alpha1.PiiMasking, error)
+	List(ctx context.Context, opts v1.ListOptions) (*actionsv1alpha1.PiiMaskingList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.PiiMasking, err error)
-	Apply(ctx context.Context, piiMasking *actionsv1alpha1.PiiMaskingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PiiMasking, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *actionsv1alpha1.PiiMasking, err error)
+	Apply(ctx context.Context, piiMasking *applyconfigurationactionsv1alpha1.PiiMaskingApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.PiiMasking, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, piiMasking *actionsv1alpha1.PiiMaskingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PiiMasking, err error)
+	ApplyStatus(ctx context.Context, piiMasking *applyconfigurationactionsv1alpha1.PiiMaskingApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.PiiMasking, err error)
 	PiiMaskingExpansion
 }
 
 // piiMaskings implements PiiMaskingInterface
 type piiMaskings struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.PiiMasking, *v1alpha1.PiiMaskingList, *actionsv1alpha1.PiiMaskingApplyConfiguration]
+	*gentype.ClientWithListAndApply[*actionsv1alpha1.PiiMasking, *actionsv1alpha1.PiiMaskingList, *applyconfigurationactionsv1alpha1.PiiMaskingApplyConfiguration]
 }
 
 // newPiiMaskings returns a PiiMaskings
 func newPiiMaskings(c *ActionsV1alpha1Client, namespace string) *piiMaskings {
 	return &piiMaskings{
-		gentype.NewClientWithListAndApply[*v1alpha1.PiiMasking, *v1alpha1.PiiMaskingList, *actionsv1alpha1.PiiMaskingApplyConfiguration](
+		gentype.NewClientWithListAndApply[*actionsv1alpha1.PiiMasking, *actionsv1alpha1.PiiMaskingList, *applyconfigurationactionsv1alpha1.PiiMaskingApplyConfiguration](
 			"piimaskings",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.PiiMasking { return &v1alpha1.PiiMasking{} },
-			func() *v1alpha1.PiiMaskingList { return &v1alpha1.PiiMaskingList{} }),
+			func() *actionsv1alpha1.PiiMasking { return &actionsv1alpha1.PiiMasking{} },
+			func() *actionsv1alpha1.PiiMaskingList { return &actionsv1alpha1.PiiMaskingList{} },
+		),
 	}
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/probabilisticsampler.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/probabilisticsampler.go
index d77b1391cd..9b06bd6279 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/probabilisticsampler.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/probabilisticsampler.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	applyconfigurationactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -37,36 +37,37 @@ type ProbabilisticSamplersGetter interface {
 
 // ProbabilisticSamplerInterface has methods to work with ProbabilisticSampler resources.
 type ProbabilisticSamplerInterface interface {
-	Create(ctx context.Context, probabilisticSampler *v1alpha1.ProbabilisticSampler, opts v1.CreateOptions) (*v1alpha1.ProbabilisticSampler, error)
-	Update(ctx context.Context, probabilisticSampler *v1alpha1.ProbabilisticSampler, opts v1.UpdateOptions) (*v1alpha1.ProbabilisticSampler, error)
+	Create(ctx context.Context, probabilisticSampler *actionsv1alpha1.ProbabilisticSampler, opts v1.CreateOptions) (*actionsv1alpha1.ProbabilisticSampler, error)
+	Update(ctx context.Context, probabilisticSampler *actionsv1alpha1.ProbabilisticSampler, opts v1.UpdateOptions) (*actionsv1alpha1.ProbabilisticSampler, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, probabilisticSampler *v1alpha1.ProbabilisticSampler, opts v1.UpdateOptions) (*v1alpha1.ProbabilisticSampler, error)
+	UpdateStatus(ctx context.Context, probabilisticSampler *actionsv1alpha1.ProbabilisticSampler, opts v1.UpdateOptions) (*actionsv1alpha1.ProbabilisticSampler, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.ProbabilisticSampler, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.ProbabilisticSamplerList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*actionsv1alpha1.ProbabilisticSampler, error)
+	List(ctx context.Context, opts v1.ListOptions) (*actionsv1alpha1.ProbabilisticSamplerList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ProbabilisticSampler, err error)
-	Apply(ctx context.Context, probabilisticSampler *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ProbabilisticSampler, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *actionsv1alpha1.ProbabilisticSampler, err error)
+	Apply(ctx context.Context, probabilisticSampler *applyconfigurationactionsv1alpha1.ProbabilisticSamplerApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.ProbabilisticSampler, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, probabilisticSampler *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.ProbabilisticSampler, err error)
+	ApplyStatus(ctx context.Context, probabilisticSampler *applyconfigurationactionsv1alpha1.ProbabilisticSamplerApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.ProbabilisticSampler, err error)
 	ProbabilisticSamplerExpansion
 }
 
 // probabilisticSamplers implements ProbabilisticSamplerInterface
 type probabilisticSamplers struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.ProbabilisticSampler, *v1alpha1.ProbabilisticSamplerList, *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration]
+	*gentype.ClientWithListAndApply[*actionsv1alpha1.ProbabilisticSampler, *actionsv1alpha1.ProbabilisticSamplerList, *applyconfigurationactionsv1alpha1.ProbabilisticSamplerApplyConfiguration]
 }
 
 // newProbabilisticSamplers returns a ProbabilisticSamplers
 func newProbabilisticSamplers(c *ActionsV1alpha1Client, namespace string) *probabilisticSamplers {
 	return &probabilisticSamplers{
-		gentype.NewClientWithListAndApply[*v1alpha1.ProbabilisticSampler, *v1alpha1.ProbabilisticSamplerList, *actionsv1alpha1.ProbabilisticSamplerApplyConfiguration](
+		gentype.NewClientWithListAndApply[*actionsv1alpha1.ProbabilisticSampler, *actionsv1alpha1.ProbabilisticSamplerList, *applyconfigurationactionsv1alpha1.ProbabilisticSamplerApplyConfiguration](
 			"probabilisticsamplers",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.ProbabilisticSampler { return &v1alpha1.ProbabilisticSampler{} },
-			func() *v1alpha1.ProbabilisticSamplerList { return &v1alpha1.ProbabilisticSamplerList{} }),
+			func() *actionsv1alpha1.ProbabilisticSampler { return &actionsv1alpha1.ProbabilisticSampler{} },
+			func() *actionsv1alpha1.ProbabilisticSamplerList { return &actionsv1alpha1.ProbabilisticSamplerList{} },
+		),
 	}
 }
diff --git a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/renameattribute.go b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/renameattribute.go
index 5a869dccad..0a8d36a5ed 100644
--- a/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/renameattribute.go
+++ b/api/generated/actions/clientset/versioned/typed/actions/v1alpha1/renameattribute.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	applyconfigurationactionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/applyconfiguration/actions/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -37,36 +37,37 @@ type RenameAttributesGetter interface {
 
 // RenameAttributeInterface has methods to work with RenameAttribute resources.
 type RenameAttributeInterface interface {
-	Create(ctx context.Context, renameAttribute *v1alpha1.RenameAttribute, opts v1.CreateOptions) (*v1alpha1.RenameAttribute, error)
-	Update(ctx context.Context, renameAttribute *v1alpha1.RenameAttribute, opts v1.UpdateOptions) (*v1alpha1.RenameAttribute, error)
+	Create(ctx context.Context, renameAttribute *actionsv1alpha1.RenameAttribute, opts v1.CreateOptions) (*actionsv1alpha1.RenameAttribute, error)
+	Update(ctx context.Context, renameAttribute *actionsv1alpha1.RenameAttribute, opts v1.UpdateOptions) (*actionsv1alpha1.RenameAttribute, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, renameAttribute *v1alpha1.RenameAttribute, opts v1.UpdateOptions) (*v1alpha1.RenameAttribute, error)
+	UpdateStatus(ctx context.Context, renameAttribute *actionsv1alpha1.RenameAttribute, opts v1.UpdateOptions) (*actionsv1alpha1.RenameAttribute, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.RenameAttribute, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.RenameAttributeList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*actionsv1alpha1.RenameAttribute, error)
+	List(ctx context.Context, opts v1.ListOptions) (*actionsv1alpha1.RenameAttributeList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.RenameAttribute, err error)
-	Apply(ctx context.Context, renameAttribute *actionsv1alpha1.RenameAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.RenameAttribute, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *actionsv1alpha1.RenameAttribute, err error)
+	Apply(ctx context.Context, renameAttribute *applyconfigurationactionsv1alpha1.RenameAttributeApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.RenameAttribute, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, renameAttribute *actionsv1alpha1.RenameAttributeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.RenameAttribute, err error)
+	ApplyStatus(ctx context.Context, renameAttribute *applyconfigurationactionsv1alpha1.RenameAttributeApplyConfiguration, opts v1.ApplyOptions) (result *actionsv1alpha1.RenameAttribute, err error)
 	RenameAttributeExpansion
 }
 
 // renameAttributes implements RenameAttributeInterface
 type renameAttributes struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.RenameAttribute, *v1alpha1.RenameAttributeList, *actionsv1alpha1.RenameAttributeApplyConfiguration]
+	*gentype.ClientWithListAndApply[*actionsv1alpha1.RenameAttribute, *actionsv1alpha1.RenameAttributeList, *applyconfigurationactionsv1alpha1.RenameAttributeApplyConfiguration]
 }
 
 // newRenameAttributes returns a RenameAttributes
 func newRenameAttributes(c *ActionsV1alpha1Client, namespace string) *renameAttributes {
 	return &renameAttributes{
-		gentype.NewClientWithListAndApply[*v1alpha1.RenameAttribute, *v1alpha1.RenameAttributeList, *actionsv1alpha1.RenameAttributeApplyConfiguration](
+		gentype.NewClientWithListAndApply[*actionsv1alpha1.RenameAttribute, *actionsv1alpha1.RenameAttributeList, *applyconfigurationactionsv1alpha1.RenameAttributeApplyConfiguration](
 			"renameattributes",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.RenameAttribute { return &v1alpha1.RenameAttribute{} },
-			func() *v1alpha1.RenameAttributeList { return &v1alpha1.RenameAttributeList{} }),
+			func() *actionsv1alpha1.RenameAttribute { return &actionsv1alpha1.RenameAttribute{} },
+			func() *actionsv1alpha1.RenameAttributeList { return &actionsv1alpha1.RenameAttributeList{} },
+		),
 	}
 }
diff --git a/api/generated/actions/informers/externalversions/actions/v1alpha1/addclusterinfo.go b/api/generated/actions/informers/externalversions/actions/v1alpha1/addclusterinfo.go
index 0586e84831..6bebe98c1d 100644
--- a/api/generated/actions/informers/externalversions/actions/v1alpha1/addclusterinfo.go
+++ b/api/generated/actions/informers/externalversions/actions/v1alpha1/addclusterinfo.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	apiactionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	versioned "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/actions/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // AddClusterInfos.
 type AddClusterInfoInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.AddClusterInfoLister
+	Lister() actionsv1alpha1.AddClusterInfoLister
 }
 
 type addClusterInfoInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredAddClusterInfoInformer(client versioned.Interface, namespace str
 				return client.ActionsV1alpha1().AddClusterInfos(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&actionsv1alpha1.AddClusterInfo{},
+		&apiactionsv1alpha1.AddClusterInfo{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *addClusterInfoInformer) defaultInformer(client versioned.Interface, res
 }
 
 func (f *addClusterInfoInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&actionsv1alpha1.AddClusterInfo{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiactionsv1alpha1.AddClusterInfo{}, f.defaultInformer)
 }
 
-func (f *addClusterInfoInformer) Lister() v1alpha1.AddClusterInfoLister {
-	return v1alpha1.NewAddClusterInfoLister(f.Informer().GetIndexer())
+func (f *addClusterInfoInformer) Lister() actionsv1alpha1.AddClusterInfoLister {
+	return actionsv1alpha1.NewAddClusterInfoLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/actions/informers/externalversions/actions/v1alpha1/deleteattribute.go b/api/generated/actions/informers/externalversions/actions/v1alpha1/deleteattribute.go
index 84f3021767..361a440d77 100644
--- a/api/generated/actions/informers/externalversions/actions/v1alpha1/deleteattribute.go
+++ b/api/generated/actions/informers/externalversions/actions/v1alpha1/deleteattribute.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	apiactionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	versioned "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/actions/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // DeleteAttributes.
 type DeleteAttributeInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.DeleteAttributeLister
+	Lister() actionsv1alpha1.DeleteAttributeLister
 }
 
 type deleteAttributeInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredDeleteAttributeInformer(client versioned.Interface, namespace st
 				return client.ActionsV1alpha1().DeleteAttributes(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&actionsv1alpha1.DeleteAttribute{},
+		&apiactionsv1alpha1.DeleteAttribute{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *deleteAttributeInformer) defaultInformer(client versioned.Interface, re
 }
 
 func (f *deleteAttributeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&actionsv1alpha1.DeleteAttribute{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiactionsv1alpha1.DeleteAttribute{}, f.defaultInformer)
 }
 
-func (f *deleteAttributeInformer) Lister() v1alpha1.DeleteAttributeLister {
-	return v1alpha1.NewDeleteAttributeLister(f.Informer().GetIndexer())
+func (f *deleteAttributeInformer) Lister() actionsv1alpha1.DeleteAttributeLister {
+	return actionsv1alpha1.NewDeleteAttributeLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/actions/informers/externalversions/actions/v1alpha1/errorsampler.go b/api/generated/actions/informers/externalversions/actions/v1alpha1/errorsampler.go
index f2bf77418c..852496df0e 100644
--- a/api/generated/actions/informers/externalversions/actions/v1alpha1/errorsampler.go
+++ b/api/generated/actions/informers/externalversions/actions/v1alpha1/errorsampler.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	apiactionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	versioned "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/actions/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // ErrorSamplers.
 type ErrorSamplerInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.ErrorSamplerLister
+	Lister() actionsv1alpha1.ErrorSamplerLister
 }
 
 type errorSamplerInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredErrorSamplerInformer(client versioned.Interface, namespace strin
 				return client.ActionsV1alpha1().ErrorSamplers(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&actionsv1alpha1.ErrorSampler{},
+		&apiactionsv1alpha1.ErrorSampler{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *errorSamplerInformer) defaultInformer(client versioned.Interface, resyn
 }
 
 func (f *errorSamplerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&actionsv1alpha1.ErrorSampler{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiactionsv1alpha1.ErrorSampler{}, f.defaultInformer)
 }
 
-func (f *errorSamplerInformer) Lister() v1alpha1.ErrorSamplerLister {
-	return v1alpha1.NewErrorSamplerLister(f.Informer().GetIndexer())
+func (f *errorSamplerInformer) Lister() actionsv1alpha1.ErrorSamplerLister {
+	return actionsv1alpha1.NewErrorSamplerLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/actions/informers/externalversions/actions/v1alpha1/latencysampler.go b/api/generated/actions/informers/externalversions/actions/v1alpha1/latencysampler.go
index 519f13a2ef..37ff1622c9 100644
--- a/api/generated/actions/informers/externalversions/actions/v1alpha1/latencysampler.go
+++ b/api/generated/actions/informers/externalversions/actions/v1alpha1/latencysampler.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	apiactionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	versioned "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/actions/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // LatencySamplers.
 type LatencySamplerInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.LatencySamplerLister
+	Lister() actionsv1alpha1.LatencySamplerLister
 }
 
 type latencySamplerInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredLatencySamplerInformer(client versioned.Interface, namespace str
 				return client.ActionsV1alpha1().LatencySamplers(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&actionsv1alpha1.LatencySampler{},
+		&apiactionsv1alpha1.LatencySampler{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *latencySamplerInformer) defaultInformer(client versioned.Interface, res
 }
 
 func (f *latencySamplerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&actionsv1alpha1.LatencySampler{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiactionsv1alpha1.LatencySampler{}, f.defaultInformer)
 }
 
-func (f *latencySamplerInformer) Lister() v1alpha1.LatencySamplerLister {
-	return v1alpha1.NewLatencySamplerLister(f.Informer().GetIndexer())
+func (f *latencySamplerInformer) Lister() actionsv1alpha1.LatencySamplerLister {
+	return actionsv1alpha1.NewLatencySamplerLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/actions/informers/externalversions/actions/v1alpha1/piimasking.go b/api/generated/actions/informers/externalversions/actions/v1alpha1/piimasking.go
index f4900a93f3..ce347e624f 100644
--- a/api/generated/actions/informers/externalversions/actions/v1alpha1/piimasking.go
+++ b/api/generated/actions/informers/externalversions/actions/v1alpha1/piimasking.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	apiactionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	versioned "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/actions/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // PiiMaskings.
 type PiiMaskingInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.PiiMaskingLister
+	Lister() actionsv1alpha1.PiiMaskingLister
 }
 
 type piiMaskingInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredPiiMaskingInformer(client versioned.Interface, namespace string,
 				return client.ActionsV1alpha1().PiiMaskings(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&actionsv1alpha1.PiiMasking{},
+		&apiactionsv1alpha1.PiiMasking{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *piiMaskingInformer) defaultInformer(client versioned.Interface, resyncP
 }
 
 func (f *piiMaskingInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&actionsv1alpha1.PiiMasking{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiactionsv1alpha1.PiiMasking{}, f.defaultInformer)
 }
 
-func (f *piiMaskingInformer) Lister() v1alpha1.PiiMaskingLister {
-	return v1alpha1.NewPiiMaskingLister(f.Informer().GetIndexer())
+func (f *piiMaskingInformer) Lister() actionsv1alpha1.PiiMaskingLister {
+	return actionsv1alpha1.NewPiiMaskingLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/actions/informers/externalversions/actions/v1alpha1/probabilisticsampler.go b/api/generated/actions/informers/externalversions/actions/v1alpha1/probabilisticsampler.go
index 4abae3ece7..42499bd9d3 100644
--- a/api/generated/actions/informers/externalversions/actions/v1alpha1/probabilisticsampler.go
+++ b/api/generated/actions/informers/externalversions/actions/v1alpha1/probabilisticsampler.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	apiactionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	versioned "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/actions/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // ProbabilisticSamplers.
 type ProbabilisticSamplerInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.ProbabilisticSamplerLister
+	Lister() actionsv1alpha1.ProbabilisticSamplerLister
 }
 
 type probabilisticSamplerInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredProbabilisticSamplerInformer(client versioned.Interface, namespa
 				return client.ActionsV1alpha1().ProbabilisticSamplers(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&actionsv1alpha1.ProbabilisticSampler{},
+		&apiactionsv1alpha1.ProbabilisticSampler{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *probabilisticSamplerInformer) defaultInformer(client versioned.Interfac
 }
 
 func (f *probabilisticSamplerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&actionsv1alpha1.ProbabilisticSampler{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiactionsv1alpha1.ProbabilisticSampler{}, f.defaultInformer)
 }
 
-func (f *probabilisticSamplerInformer) Lister() v1alpha1.ProbabilisticSamplerLister {
-	return v1alpha1.NewProbabilisticSamplerLister(f.Informer().GetIndexer())
+func (f *probabilisticSamplerInformer) Lister() actionsv1alpha1.ProbabilisticSamplerLister {
+	return actionsv1alpha1.NewProbabilisticSamplerLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/actions/informers/externalversions/actions/v1alpha1/renameattribute.go b/api/generated/actions/informers/externalversions/actions/v1alpha1/renameattribute.go
index 8724e7939b..3d37306247 100644
--- a/api/generated/actions/informers/externalversions/actions/v1alpha1/renameattribute.go
+++ b/api/generated/actions/informers/externalversions/actions/v1alpha1/renameattribute.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
-	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	apiactionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	versioned "github.com/odigos-io/odigos/api/generated/actions/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/actions/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/generated/actions/listers/actions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // RenameAttributes.
 type RenameAttributeInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.RenameAttributeLister
+	Lister() actionsv1alpha1.RenameAttributeLister
 }
 
 type renameAttributeInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredRenameAttributeInformer(client versioned.Interface, namespace st
 				return client.ActionsV1alpha1().RenameAttributes(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&actionsv1alpha1.RenameAttribute{},
+		&apiactionsv1alpha1.RenameAttribute{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *renameAttributeInformer) defaultInformer(client versioned.Interface, re
 }
 
 func (f *renameAttributeInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&actionsv1alpha1.RenameAttribute{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiactionsv1alpha1.RenameAttribute{}, f.defaultInformer)
 }
 
-func (f *renameAttributeInformer) Lister() v1alpha1.RenameAttributeLister {
-	return v1alpha1.NewRenameAttributeLister(f.Informer().GetIndexer())
+func (f *renameAttributeInformer) Lister() actionsv1alpha1.RenameAttributeLister {
+	return actionsv1alpha1.NewRenameAttributeLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/actions/informers/externalversions/generic.go b/api/generated/actions/informers/externalversions/generic.go
index 086eb32ef5..36ded559dd 100644
--- a/api/generated/actions/informers/externalversions/generic.go
+++ b/api/generated/actions/informers/externalversions/generic.go
@@ -18,7 +18,7 @@ limitations under the License.
 package externalversions
 
 import (
-	"fmt"
+	fmt "fmt"
 
 	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/api/generated/actions/listers/actions/v1alpha1/addclusterinfo.go b/api/generated/actions/listers/actions/v1alpha1/addclusterinfo.go
index b207d53776..c36057f364 100644
--- a/api/generated/actions/listers/actions/v1alpha1/addclusterinfo.go
+++ b/api/generated/actions/listers/actions/v1alpha1/addclusterinfo.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // AddClusterInfoLister helps list AddClusterInfos.
@@ -29,7 +29,7 @@ import (
 type AddClusterInfoLister interface {
 	// List lists all AddClusterInfos in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.AddClusterInfo, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.AddClusterInfo, err error)
 	// AddClusterInfos returns an object that can list and get AddClusterInfos.
 	AddClusterInfos(namespace string) AddClusterInfoNamespaceLister
 	AddClusterInfoListerExpansion
@@ -37,17 +37,17 @@ type AddClusterInfoLister interface {
 
 // addClusterInfoLister implements the AddClusterInfoLister interface.
 type addClusterInfoLister struct {
-	listers.ResourceIndexer[*v1alpha1.AddClusterInfo]
+	listers.ResourceIndexer[*actionsv1alpha1.AddClusterInfo]
 }
 
 // NewAddClusterInfoLister returns a new AddClusterInfoLister.
 func NewAddClusterInfoLister(indexer cache.Indexer) AddClusterInfoLister {
-	return &addClusterInfoLister{listers.New[*v1alpha1.AddClusterInfo](indexer, v1alpha1.Resource("addclusterinfo"))}
+	return &addClusterInfoLister{listers.New[*actionsv1alpha1.AddClusterInfo](indexer, actionsv1alpha1.Resource("addclusterinfo"))}
 }
 
 // AddClusterInfos returns an object that can list and get AddClusterInfos.
 func (s *addClusterInfoLister) AddClusterInfos(namespace string) AddClusterInfoNamespaceLister {
-	return addClusterInfoNamespaceLister{listers.NewNamespaced[*v1alpha1.AddClusterInfo](s.ResourceIndexer, namespace)}
+	return addClusterInfoNamespaceLister{listers.NewNamespaced[*actionsv1alpha1.AddClusterInfo](s.ResourceIndexer, namespace)}
 }
 
 // AddClusterInfoNamespaceLister helps list and get AddClusterInfos.
@@ -55,15 +55,15 @@ func (s *addClusterInfoLister) AddClusterInfos(namespace string) AddClusterInfoN
 type AddClusterInfoNamespaceLister interface {
 	// List lists all AddClusterInfos in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.AddClusterInfo, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.AddClusterInfo, err error)
 	// Get retrieves the AddClusterInfo from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.AddClusterInfo, error)
+	Get(name string) (*actionsv1alpha1.AddClusterInfo, error)
 	AddClusterInfoNamespaceListerExpansion
 }
 
 // addClusterInfoNamespaceLister implements the AddClusterInfoNamespaceLister
 // interface.
 type addClusterInfoNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.AddClusterInfo]
+	listers.ResourceIndexer[*actionsv1alpha1.AddClusterInfo]
 }
diff --git a/api/generated/actions/listers/actions/v1alpha1/deleteattribute.go b/api/generated/actions/listers/actions/v1alpha1/deleteattribute.go
index b908e2ec72..c9c9566f5b 100644
--- a/api/generated/actions/listers/actions/v1alpha1/deleteattribute.go
+++ b/api/generated/actions/listers/actions/v1alpha1/deleteattribute.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // DeleteAttributeLister helps list DeleteAttributes.
@@ -29,7 +29,7 @@ import (
 type DeleteAttributeLister interface {
 	// List lists all DeleteAttributes in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.DeleteAttribute, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.DeleteAttribute, err error)
 	// DeleteAttributes returns an object that can list and get DeleteAttributes.
 	DeleteAttributes(namespace string) DeleteAttributeNamespaceLister
 	DeleteAttributeListerExpansion
@@ -37,17 +37,17 @@ type DeleteAttributeLister interface {
 
 // deleteAttributeLister implements the DeleteAttributeLister interface.
 type deleteAttributeLister struct {
-	listers.ResourceIndexer[*v1alpha1.DeleteAttribute]
+	listers.ResourceIndexer[*actionsv1alpha1.DeleteAttribute]
 }
 
 // NewDeleteAttributeLister returns a new DeleteAttributeLister.
 func NewDeleteAttributeLister(indexer cache.Indexer) DeleteAttributeLister {
-	return &deleteAttributeLister{listers.New[*v1alpha1.DeleteAttribute](indexer, v1alpha1.Resource("deleteattribute"))}
+	return &deleteAttributeLister{listers.New[*actionsv1alpha1.DeleteAttribute](indexer, actionsv1alpha1.Resource("deleteattribute"))}
 }
 
 // DeleteAttributes returns an object that can list and get DeleteAttributes.
 func (s *deleteAttributeLister) DeleteAttributes(namespace string) DeleteAttributeNamespaceLister {
-	return deleteAttributeNamespaceLister{listers.NewNamespaced[*v1alpha1.DeleteAttribute](s.ResourceIndexer, namespace)}
+	return deleteAttributeNamespaceLister{listers.NewNamespaced[*actionsv1alpha1.DeleteAttribute](s.ResourceIndexer, namespace)}
 }
 
 // DeleteAttributeNamespaceLister helps list and get DeleteAttributes.
@@ -55,15 +55,15 @@ func (s *deleteAttributeLister) DeleteAttributes(namespace string) DeleteAttribu
 type DeleteAttributeNamespaceLister interface {
 	// List lists all DeleteAttributes in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.DeleteAttribute, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.DeleteAttribute, err error)
 	// Get retrieves the DeleteAttribute from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.DeleteAttribute, error)
+	Get(name string) (*actionsv1alpha1.DeleteAttribute, error)
 	DeleteAttributeNamespaceListerExpansion
 }
 
 // deleteAttributeNamespaceLister implements the DeleteAttributeNamespaceLister
 // interface.
 type deleteAttributeNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.DeleteAttribute]
+	listers.ResourceIndexer[*actionsv1alpha1.DeleteAttribute]
 }
diff --git a/api/generated/actions/listers/actions/v1alpha1/errorsampler.go b/api/generated/actions/listers/actions/v1alpha1/errorsampler.go
index 23972af235..35bc944f1c 100644
--- a/api/generated/actions/listers/actions/v1alpha1/errorsampler.go
+++ b/api/generated/actions/listers/actions/v1alpha1/errorsampler.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // ErrorSamplerLister helps list ErrorSamplers.
@@ -29,7 +29,7 @@ import (
 type ErrorSamplerLister interface {
 	// List lists all ErrorSamplers in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.ErrorSampler, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.ErrorSampler, err error)
 	// ErrorSamplers returns an object that can list and get ErrorSamplers.
 	ErrorSamplers(namespace string) ErrorSamplerNamespaceLister
 	ErrorSamplerListerExpansion
@@ -37,17 +37,17 @@ type ErrorSamplerLister interface {
 
 // errorSamplerLister implements the ErrorSamplerLister interface.
 type errorSamplerLister struct {
-	listers.ResourceIndexer[*v1alpha1.ErrorSampler]
+	listers.ResourceIndexer[*actionsv1alpha1.ErrorSampler]
 }
 
 // NewErrorSamplerLister returns a new ErrorSamplerLister.
 func NewErrorSamplerLister(indexer cache.Indexer) ErrorSamplerLister {
-	return &errorSamplerLister{listers.New[*v1alpha1.ErrorSampler](indexer, v1alpha1.Resource("errorsampler"))}
+	return &errorSamplerLister{listers.New[*actionsv1alpha1.ErrorSampler](indexer, actionsv1alpha1.Resource("errorsampler"))}
 }
 
 // ErrorSamplers returns an object that can list and get ErrorSamplers.
 func (s *errorSamplerLister) ErrorSamplers(namespace string) ErrorSamplerNamespaceLister {
-	return errorSamplerNamespaceLister{listers.NewNamespaced[*v1alpha1.ErrorSampler](s.ResourceIndexer, namespace)}
+	return errorSamplerNamespaceLister{listers.NewNamespaced[*actionsv1alpha1.ErrorSampler](s.ResourceIndexer, namespace)}
 }
 
 // ErrorSamplerNamespaceLister helps list and get ErrorSamplers.
@@ -55,15 +55,15 @@ func (s *errorSamplerLister) ErrorSamplers(namespace string) ErrorSamplerNamespa
 type ErrorSamplerNamespaceLister interface {
 	// List lists all ErrorSamplers in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.ErrorSampler, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.ErrorSampler, err error)
 	// Get retrieves the ErrorSampler from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.ErrorSampler, error)
+	Get(name string) (*actionsv1alpha1.ErrorSampler, error)
 	ErrorSamplerNamespaceListerExpansion
 }
 
 // errorSamplerNamespaceLister implements the ErrorSamplerNamespaceLister
 // interface.
 type errorSamplerNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.ErrorSampler]
+	listers.ResourceIndexer[*actionsv1alpha1.ErrorSampler]
 }
diff --git a/api/generated/actions/listers/actions/v1alpha1/latencysampler.go b/api/generated/actions/listers/actions/v1alpha1/latencysampler.go
index 3f665d60c7..950fbaeab3 100644
--- a/api/generated/actions/listers/actions/v1alpha1/latencysampler.go
+++ b/api/generated/actions/listers/actions/v1alpha1/latencysampler.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // LatencySamplerLister helps list LatencySamplers.
@@ -29,7 +29,7 @@ import (
 type LatencySamplerLister interface {
 	// List lists all LatencySamplers in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.LatencySampler, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.LatencySampler, err error)
 	// LatencySamplers returns an object that can list and get LatencySamplers.
 	LatencySamplers(namespace string) LatencySamplerNamespaceLister
 	LatencySamplerListerExpansion
@@ -37,17 +37,17 @@ type LatencySamplerLister interface {
 
 // latencySamplerLister implements the LatencySamplerLister interface.
 type latencySamplerLister struct {
-	listers.ResourceIndexer[*v1alpha1.LatencySampler]
+	listers.ResourceIndexer[*actionsv1alpha1.LatencySampler]
 }
 
 // NewLatencySamplerLister returns a new LatencySamplerLister.
 func NewLatencySamplerLister(indexer cache.Indexer) LatencySamplerLister {
-	return &latencySamplerLister{listers.New[*v1alpha1.LatencySampler](indexer, v1alpha1.Resource("latencysampler"))}
+	return &latencySamplerLister{listers.New[*actionsv1alpha1.LatencySampler](indexer, actionsv1alpha1.Resource("latencysampler"))}
 }
 
 // LatencySamplers returns an object that can list and get LatencySamplers.
 func (s *latencySamplerLister) LatencySamplers(namespace string) LatencySamplerNamespaceLister {
-	return latencySamplerNamespaceLister{listers.NewNamespaced[*v1alpha1.LatencySampler](s.ResourceIndexer, namespace)}
+	return latencySamplerNamespaceLister{listers.NewNamespaced[*actionsv1alpha1.LatencySampler](s.ResourceIndexer, namespace)}
 }
 
 // LatencySamplerNamespaceLister helps list and get LatencySamplers.
@@ -55,15 +55,15 @@ func (s *latencySamplerLister) LatencySamplers(namespace string) LatencySamplerN
 type LatencySamplerNamespaceLister interface {
 	// List lists all LatencySamplers in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.LatencySampler, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.LatencySampler, err error)
 	// Get retrieves the LatencySampler from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.LatencySampler, error)
+	Get(name string) (*actionsv1alpha1.LatencySampler, error)
 	LatencySamplerNamespaceListerExpansion
 }
 
 // latencySamplerNamespaceLister implements the LatencySamplerNamespaceLister
 // interface.
 type latencySamplerNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.LatencySampler]
+	listers.ResourceIndexer[*actionsv1alpha1.LatencySampler]
 }
diff --git a/api/generated/actions/listers/actions/v1alpha1/piimasking.go b/api/generated/actions/listers/actions/v1alpha1/piimasking.go
index 651e2b0883..e96b15f973 100644
--- a/api/generated/actions/listers/actions/v1alpha1/piimasking.go
+++ b/api/generated/actions/listers/actions/v1alpha1/piimasking.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // PiiMaskingLister helps list PiiMaskings.
@@ -29,7 +29,7 @@ import (
 type PiiMaskingLister interface {
 	// List lists all PiiMaskings in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.PiiMasking, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.PiiMasking, err error)
 	// PiiMaskings returns an object that can list and get PiiMaskings.
 	PiiMaskings(namespace string) PiiMaskingNamespaceLister
 	PiiMaskingListerExpansion
@@ -37,17 +37,17 @@ type PiiMaskingLister interface {
 
 // piiMaskingLister implements the PiiMaskingLister interface.
 type piiMaskingLister struct {
-	listers.ResourceIndexer[*v1alpha1.PiiMasking]
+	listers.ResourceIndexer[*actionsv1alpha1.PiiMasking]
 }
 
 // NewPiiMaskingLister returns a new PiiMaskingLister.
 func NewPiiMaskingLister(indexer cache.Indexer) PiiMaskingLister {
-	return &piiMaskingLister{listers.New[*v1alpha1.PiiMasking](indexer, v1alpha1.Resource("piimasking"))}
+	return &piiMaskingLister{listers.New[*actionsv1alpha1.PiiMasking](indexer, actionsv1alpha1.Resource("piimasking"))}
 }
 
 // PiiMaskings returns an object that can list and get PiiMaskings.
 func (s *piiMaskingLister) PiiMaskings(namespace string) PiiMaskingNamespaceLister {
-	return piiMaskingNamespaceLister{listers.NewNamespaced[*v1alpha1.PiiMasking](s.ResourceIndexer, namespace)}
+	return piiMaskingNamespaceLister{listers.NewNamespaced[*actionsv1alpha1.PiiMasking](s.ResourceIndexer, namespace)}
 }
 
 // PiiMaskingNamespaceLister helps list and get PiiMaskings.
@@ -55,15 +55,15 @@ func (s *piiMaskingLister) PiiMaskings(namespace string) PiiMaskingNamespaceList
 type PiiMaskingNamespaceLister interface {
 	// List lists all PiiMaskings in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.PiiMasking, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.PiiMasking, err error)
 	// Get retrieves the PiiMasking from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.PiiMasking, error)
+	Get(name string) (*actionsv1alpha1.PiiMasking, error)
 	PiiMaskingNamespaceListerExpansion
 }
 
 // piiMaskingNamespaceLister implements the PiiMaskingNamespaceLister
 // interface.
 type piiMaskingNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.PiiMasking]
+	listers.ResourceIndexer[*actionsv1alpha1.PiiMasking]
 }
diff --git a/api/generated/actions/listers/actions/v1alpha1/probabilisticsampler.go b/api/generated/actions/listers/actions/v1alpha1/probabilisticsampler.go
index aa9c190846..e3eabb1390 100644
--- a/api/generated/actions/listers/actions/v1alpha1/probabilisticsampler.go
+++ b/api/generated/actions/listers/actions/v1alpha1/probabilisticsampler.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // ProbabilisticSamplerLister helps list ProbabilisticSamplers.
@@ -29,7 +29,7 @@ import (
 type ProbabilisticSamplerLister interface {
 	// List lists all ProbabilisticSamplers in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.ProbabilisticSampler, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.ProbabilisticSampler, err error)
 	// ProbabilisticSamplers returns an object that can list and get ProbabilisticSamplers.
 	ProbabilisticSamplers(namespace string) ProbabilisticSamplerNamespaceLister
 	ProbabilisticSamplerListerExpansion
@@ -37,17 +37,17 @@ type ProbabilisticSamplerLister interface {
 
 // probabilisticSamplerLister implements the ProbabilisticSamplerLister interface.
 type probabilisticSamplerLister struct {
-	listers.ResourceIndexer[*v1alpha1.ProbabilisticSampler]
+	listers.ResourceIndexer[*actionsv1alpha1.ProbabilisticSampler]
 }
 
 // NewProbabilisticSamplerLister returns a new ProbabilisticSamplerLister.
 func NewProbabilisticSamplerLister(indexer cache.Indexer) ProbabilisticSamplerLister {
-	return &probabilisticSamplerLister{listers.New[*v1alpha1.ProbabilisticSampler](indexer, v1alpha1.Resource("probabilisticsampler"))}
+	return &probabilisticSamplerLister{listers.New[*actionsv1alpha1.ProbabilisticSampler](indexer, actionsv1alpha1.Resource("probabilisticsampler"))}
 }
 
 // ProbabilisticSamplers returns an object that can list and get ProbabilisticSamplers.
 func (s *probabilisticSamplerLister) ProbabilisticSamplers(namespace string) ProbabilisticSamplerNamespaceLister {
-	return probabilisticSamplerNamespaceLister{listers.NewNamespaced[*v1alpha1.ProbabilisticSampler](s.ResourceIndexer, namespace)}
+	return probabilisticSamplerNamespaceLister{listers.NewNamespaced[*actionsv1alpha1.ProbabilisticSampler](s.ResourceIndexer, namespace)}
 }
 
 // ProbabilisticSamplerNamespaceLister helps list and get ProbabilisticSamplers.
@@ -55,15 +55,15 @@ func (s *probabilisticSamplerLister) ProbabilisticSamplers(namespace string) Pro
 type ProbabilisticSamplerNamespaceLister interface {
 	// List lists all ProbabilisticSamplers in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.ProbabilisticSampler, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.ProbabilisticSampler, err error)
 	// Get retrieves the ProbabilisticSampler from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.ProbabilisticSampler, error)
+	Get(name string) (*actionsv1alpha1.ProbabilisticSampler, error)
 	ProbabilisticSamplerNamespaceListerExpansion
 }
 
 // probabilisticSamplerNamespaceLister implements the ProbabilisticSamplerNamespaceLister
 // interface.
 type probabilisticSamplerNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.ProbabilisticSampler]
+	listers.ResourceIndexer[*actionsv1alpha1.ProbabilisticSampler]
 }
diff --git a/api/generated/actions/listers/actions/v1alpha1/renameattribute.go b/api/generated/actions/listers/actions/v1alpha1/renameattribute.go
index 7631c93358..0577fb2f02 100644
--- a/api/generated/actions/listers/actions/v1alpha1/renameattribute.go
+++ b/api/generated/actions/listers/actions/v1alpha1/renameattribute.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	actionsv1alpha1 "github.com/odigos-io/odigos/api/actions/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // RenameAttributeLister helps list RenameAttributes.
@@ -29,7 +29,7 @@ import (
 type RenameAttributeLister interface {
 	// List lists all RenameAttributes in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.RenameAttribute, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.RenameAttribute, err error)
 	// RenameAttributes returns an object that can list and get RenameAttributes.
 	RenameAttributes(namespace string) RenameAttributeNamespaceLister
 	RenameAttributeListerExpansion
@@ -37,17 +37,17 @@ type RenameAttributeLister interface {
 
 // renameAttributeLister implements the RenameAttributeLister interface.
 type renameAttributeLister struct {
-	listers.ResourceIndexer[*v1alpha1.RenameAttribute]
+	listers.ResourceIndexer[*actionsv1alpha1.RenameAttribute]
 }
 
 // NewRenameAttributeLister returns a new RenameAttributeLister.
 func NewRenameAttributeLister(indexer cache.Indexer) RenameAttributeLister {
-	return &renameAttributeLister{listers.New[*v1alpha1.RenameAttribute](indexer, v1alpha1.Resource("renameattribute"))}
+	return &renameAttributeLister{listers.New[*actionsv1alpha1.RenameAttribute](indexer, actionsv1alpha1.Resource("renameattribute"))}
 }
 
 // RenameAttributes returns an object that can list and get RenameAttributes.
 func (s *renameAttributeLister) RenameAttributes(namespace string) RenameAttributeNamespaceLister {
-	return renameAttributeNamespaceLister{listers.NewNamespaced[*v1alpha1.RenameAttribute](s.ResourceIndexer, namespace)}
+	return renameAttributeNamespaceLister{listers.NewNamespaced[*actionsv1alpha1.RenameAttribute](s.ResourceIndexer, namespace)}
 }
 
 // RenameAttributeNamespaceLister helps list and get RenameAttributes.
@@ -55,15 +55,15 @@ func (s *renameAttributeLister) RenameAttributes(namespace string) RenameAttribu
 type RenameAttributeNamespaceLister interface {
 	// List lists all RenameAttributes in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.RenameAttribute, err error)
+	List(selector labels.Selector) (ret []*actionsv1alpha1.RenameAttribute, err error)
 	// Get retrieves the RenameAttribute from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.RenameAttribute, error)
+	Get(name string) (*actionsv1alpha1.RenameAttribute, error)
 	RenameAttributeNamespaceListerExpansion
 }
 
 // renameAttributeNamespaceLister implements the RenameAttributeNamespaceLister
 // interface.
 type renameAttributeNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.RenameAttribute]
+	listers.ResourceIndexer[*actionsv1alpha1.RenameAttribute]
 }
diff --git a/api/generated/odigos/applyconfiguration/internal/internal.go b/api/generated/odigos/applyconfiguration/internal/internal.go
index 57dabcd595..b171e7594d 100644
--- a/api/generated/odigos/applyconfiguration/internal/internal.go
+++ b/api/generated/odigos/applyconfiguration/internal/internal.go
@@ -18,8 +18,8 @@ limitations under the License.
 package internal
 
 import (
-	"fmt"
-	"sync"
+	fmt "fmt"
+	sync "sync"
 
 	typed "sigs.k8s.io/structured-merge-diff/v4/typed"
 )
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/attributecondition.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/attributecondition.go
index e2ba16d4e8..d96e2a0365 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/attributecondition.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/attributecondition.go
@@ -18,16 +18,16 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	attribute "go.opentelemetry.io/otel/attribute"
 )
 
 // AttributeConditionApplyConfiguration represents a declarative configuration of the AttributeCondition type for use
 // with apply.
 type AttributeConditionApplyConfiguration struct {
-	Key      *attribute.Key     `json:"key,omitempty"`
-	Val      *string            `json:"val,omitempty"`
-	Operator *v1alpha1.Operator `json:"operator,omitempty"`
+	Key      *attribute.Key           `json:"key,omitempty"`
+	Val      *string                  `json:"val,omitempty"`
+	Operator *odigosv1alpha1.Operator `json:"operator,omitempty"`
 }
 
 // AttributeConditionApplyConfiguration constructs a declarative configuration of the AttributeCondition type for use with
@@ -55,7 +55,7 @@ func (b *AttributeConditionApplyConfiguration) WithVal(value string) *AttributeC
 // WithOperator sets the Operator field in the declarative configuration to the given value
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Operator field is set to the value of the last call.
-func (b *AttributeConditionApplyConfiguration) WithOperator(value v1alpha1.Operator) *AttributeConditionApplyConfiguration {
+func (b *AttributeConditionApplyConfiguration) WithOperator(value odigosv1alpha1.Operator) *AttributeConditionApplyConfiguration {
 	b.Operator = &value
 	return b
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroup.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroup.go
index a759854207..4c3febf430 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroup.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroup.go
@@ -47,7 +47,7 @@ func CollectorsGroup(name, namespace string) *CollectorsGroupApplyConfiguration
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithKind(value string) *CollectorsGroupApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *CollectorsGroupApplyConfiguration) WithKind(value string) *CollectorsGr
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithAPIVersion(value string) *CollectorsGroupApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *CollectorsGroupApplyConfiguration) WithAPIVersion(value string) *Collec
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithName(value string) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *CollectorsGroupApplyConfiguration) WithName(value string) *CollectorsGr
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithGenerateName(value string) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *CollectorsGroupApplyConfiguration) WithGenerateName(value string) *Coll
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithNamespace(value string) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *CollectorsGroupApplyConfiguration) WithNamespace(value string) *Collect
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithUID(value types.UID) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *CollectorsGroupApplyConfiguration) WithUID(value types.UID) *Collectors
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithResourceVersion(value string) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *CollectorsGroupApplyConfiguration) WithResourceVersion(value string) *C
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithGeneration(value int64) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *CollectorsGroupApplyConfiguration) WithGeneration(value int64) *Collect
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithCreationTimestamp(value metav1.Time) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *CollectorsGroupApplyConfiguration) WithCreationTimestamp(value metav1.T
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *CollectorsGroupApplyConfiguration) WithDeletionTimestamp(value metav1.T
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *CollectorsGroupApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *CollectorsGroupApplyConfiguration) WithDeletionGracePeriodSeconds(value
 // overwriting an existing map entries in Labels field with the same key.
 func (b *CollectorsGroupApplyConfiguration) WithLabels(entries map[string]string) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *CollectorsGroupApplyConfiguration) WithLabels(entries map[string]string
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *CollectorsGroupApplyConfiguration) WithAnnotations(entries map[string]string) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *CollectorsGroupApplyConfiguration) WithOwnerReferences(values ...*v1.Ow
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *CollectorsGroupApplyConfiguration) WithOwnerReferences(values ...*v1.Ow
 func (b *CollectorsGroupApplyConfiguration) WithFinalizers(values ...string) *CollectorsGroupApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *CollectorsGroupApplyConfiguration) WithStatus(value *CollectorsGroupSta
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *CollectorsGroupApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroupspec.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroupspec.go
index 0fdc93d964..cea34bf4ce 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroupspec.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroupspec.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 )
 
 // CollectorsGroupSpecApplyConfiguration represents a declarative configuration of the CollectorsGroupSpec type for use
 // with apply.
 type CollectorsGroupSpecApplyConfiguration struct {
-	Role                    *v1alpha1.CollectorsGroupRole                       `json:"role,omitempty"`
+	Role                    *odigosv1alpha1.CollectorsGroupRole                 `json:"role,omitempty"`
 	CollectorOwnMetricsPort *int32                                              `json:"collectorOwnMetricsPort,omitempty"`
 	ResourcesSettings       *CollectorsGroupResourcesSettingsApplyConfiguration `json:"resourcesSettings,omitempty"`
 }
@@ -38,7 +38,7 @@ func CollectorsGroupSpec() *CollectorsGroupSpecApplyConfiguration {
 // WithRole sets the Role field in the declarative configuration to the given value
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Role field is set to the value of the last call.
-func (b *CollectorsGroupSpecApplyConfiguration) WithRole(value v1alpha1.CollectorsGroupRole) *CollectorsGroupSpecApplyConfiguration {
+func (b *CollectorsGroupSpecApplyConfiguration) WithRole(value odigosv1alpha1.CollectorsGroupRole) *CollectorsGroupSpecApplyConfiguration {
 	b.Role = &value
 	return b
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/destination.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/destination.go
index dddca78b27..11b2994f17 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/destination.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/destination.go
@@ -47,7 +47,7 @@ func Destination(name, namespace string) *DestinationApplyConfiguration {
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithKind(value string) *DestinationApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *DestinationApplyConfiguration) WithKind(value string) *DestinationApply
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithAPIVersion(value string) *DestinationApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *DestinationApplyConfiguration) WithAPIVersion(value string) *Destinatio
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithName(value string) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *DestinationApplyConfiguration) WithName(value string) *DestinationApply
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithGenerateName(value string) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *DestinationApplyConfiguration) WithGenerateName(value string) *Destinat
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithNamespace(value string) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *DestinationApplyConfiguration) WithNamespace(value string) *Destination
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithUID(value types.UID) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *DestinationApplyConfiguration) WithUID(value types.UID) *DestinationApp
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithResourceVersion(value string) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *DestinationApplyConfiguration) WithResourceVersion(value string) *Desti
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithGeneration(value int64) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *DestinationApplyConfiguration) WithGeneration(value int64) *Destination
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithCreationTimestamp(value metav1.Time) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *DestinationApplyConfiguration) WithCreationTimestamp(value metav1.Time)
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *DestinationApplyConfiguration) WithDeletionTimestamp(value metav1.Time)
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *DestinationApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *DestinationApplyConfiguration) WithDeletionGracePeriodSeconds(value int
 // overwriting an existing map entries in Labels field with the same key.
 func (b *DestinationApplyConfiguration) WithLabels(entries map[string]string) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *DestinationApplyConfiguration) WithLabels(entries map[string]string) *D
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *DestinationApplyConfiguration) WithAnnotations(entries map[string]string) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *DestinationApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerR
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *DestinationApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerR
 func (b *DestinationApplyConfiguration) WithFinalizers(values ...string) *DestinationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *DestinationApplyConfiguration) WithStatus(value *DestinationStatusApply
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *DestinationApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationconfig.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationconfig.go
index f0d09337f7..3877b8aa20 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationconfig.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationconfig.go
@@ -47,7 +47,7 @@ func InstrumentationConfig(name, namespace string) *InstrumentationConfigApplyCo
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithKind(value string) *InstrumentationConfigApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithKind(value string) *Instru
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithAPIVersion(value string) *InstrumentationConfigApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithAPIVersion(value string) *
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithName(value string) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithName(value string) *Instru
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithGenerateName(value string) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithGenerateName(value string)
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithNamespace(value string) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithNamespace(value string) *I
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithUID(value types.UID) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithUID(value types.UID) *Inst
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithResourceVersion(value string) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithResourceVersion(value stri
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithGeneration(value int64) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithGeneration(value int64) *I
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithCreationTimestamp(value metav1.Time) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithCreationTimestamp(value me
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithDeletionTimestamp(value me
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *InstrumentationConfigApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *InstrumentationConfigApplyConfiguration) WithDeletionGracePeriodSeconds
 // overwriting an existing map entries in Labels field with the same key.
 func (b *InstrumentationConfigApplyConfiguration) WithLabels(entries map[string]string) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *InstrumentationConfigApplyConfiguration) WithLabels(entries map[string]
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *InstrumentationConfigApplyConfiguration) WithAnnotations(entries map[string]string) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithOwnerReferences(values ...
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *InstrumentationConfigApplyConfiguration) WithOwnerReferences(values ...
 func (b *InstrumentationConfigApplyConfiguration) WithFinalizers(values ...string) *InstrumentationConfigApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *InstrumentationConfigApplyConfiguration) WithStatus(value *Instrumentat
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *InstrumentationConfigApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationinstance.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationinstance.go
index fa3de6a37f..92cd34b0e6 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationinstance.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationinstance.go
@@ -47,7 +47,7 @@ func InstrumentationInstance(name, namespace string) *InstrumentationInstanceApp
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithKind(value string) *InstrumentationInstanceApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithKind(value string) *Inst
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithAPIVersion(value string) *InstrumentationInstanceApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithAPIVersion(value string)
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithName(value string) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithName(value string) *Inst
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithGenerateName(value string) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithGenerateName(value strin
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithNamespace(value string) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithNamespace(value string)
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithUID(value types.UID) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithUID(value types.UID) *In
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithResourceVersion(value string) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithResourceVersion(value st
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithGeneration(value int64) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithGeneration(value int64)
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithCreationTimestamp(value metav1.Time) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithCreationTimestamp(value
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithDeletionTimestamp(value
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *InstrumentationInstanceApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *InstrumentationInstanceApplyConfiguration) WithDeletionGracePeriodSecon
 // overwriting an existing map entries in Labels field with the same key.
 func (b *InstrumentationInstanceApplyConfiguration) WithLabels(entries map[string]string) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *InstrumentationInstanceApplyConfiguration) WithLabels(entries map[strin
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *InstrumentationInstanceApplyConfiguration) WithAnnotations(entries map[string]string) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithOwnerReferences(values .
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *InstrumentationInstanceApplyConfiguration) WithOwnerReferences(values .
 func (b *InstrumentationInstanceApplyConfiguration) WithFinalizers(values ...string) *InstrumentationInstanceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *InstrumentationInstanceApplyConfiguration) WithStatus(value *Instrument
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *InstrumentationInstanceApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationlibrarystatus.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationlibrarystatus.go
index d102efffe3..4fdcc9ed97 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationlibrarystatus.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationlibrarystatus.go
@@ -18,21 +18,21 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // InstrumentationLibraryStatusApplyConfiguration represents a declarative configuration of the InstrumentationLibraryStatus type for use
 // with apply.
 type InstrumentationLibraryStatusApplyConfiguration struct {
-	Name                     *string                              `json:"name,omitempty"`
-	Type                     *v1alpha1.InstrumentationLibraryType `json:"type,omitempty"`
-	IdentifyingAttributes    []AttributeApplyConfiguration        `json:"identifyingAttributes,omitempty"`
-	NonIdentifyingAttributes []AttributeApplyConfiguration        `json:"nonIdentifyingAttributes,omitempty"`
-	Healthy                  *bool                                `json:"healthy,omitempty"`
-	Message                  *string                              `json:"message,omitempty"`
-	Reason                   *string                              `json:"reason,omitempty"`
-	LastStatusTime           *v1.Time                             `json:"lastStatusTime,omitempty"`
+	Name                     *string                                    `json:"name,omitempty"`
+	Type                     *odigosv1alpha1.InstrumentationLibraryType `json:"type,omitempty"`
+	IdentifyingAttributes    []AttributeApplyConfiguration              `json:"identifyingAttributes,omitempty"`
+	NonIdentifyingAttributes []AttributeApplyConfiguration              `json:"nonIdentifyingAttributes,omitempty"`
+	Healthy                  *bool                                      `json:"healthy,omitempty"`
+	Message                  *string                                    `json:"message,omitempty"`
+	Reason                   *string                                    `json:"reason,omitempty"`
+	LastStatusTime           *v1.Time                                   `json:"lastStatusTime,omitempty"`
 }
 
 // InstrumentationLibraryStatusApplyConfiguration constructs a declarative configuration of the InstrumentationLibraryStatus type for use with
@@ -52,7 +52,7 @@ func (b *InstrumentationLibraryStatusApplyConfiguration) WithName(value string)
 // WithType sets the Type field in the declarative configuration to the given value
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Type field is set to the value of the last call.
-func (b *InstrumentationLibraryStatusApplyConfiguration) WithType(value v1alpha1.InstrumentationLibraryType) *InstrumentationLibraryStatusApplyConfiguration {
+func (b *InstrumentationLibraryStatusApplyConfiguration) WithType(value odigosv1alpha1.InstrumentationLibraryType) *InstrumentationLibraryStatusApplyConfiguration {
 	b.Type = &value
 	return b
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrule.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrule.go
index d37e7f3b11..8d1d72980d 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrule.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentationrule.go
@@ -47,7 +47,7 @@ func InstrumentationRule(name, namespace string) *InstrumentationRuleApplyConfig
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithKind(value string) *InstrumentationRuleApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithKind(value string) *Instrume
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithAPIVersion(value string) *InstrumentationRuleApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithAPIVersion(value string) *In
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithName(value string) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithName(value string) *Instrume
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithGenerateName(value string) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithGenerateName(value string) *
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithNamespace(value string) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithNamespace(value string) *Ins
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithUID(value types.UID) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithUID(value types.UID) *Instru
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithResourceVersion(value string) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithResourceVersion(value string
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithGeneration(value int64) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithGeneration(value int64) *Ins
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithCreationTimestamp(value metav1.Time) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithCreationTimestamp(value meta
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithDeletionTimestamp(value meta
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *InstrumentationRuleApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *InstrumentationRuleApplyConfiguration) WithDeletionGracePeriodSeconds(v
 // overwriting an existing map entries in Labels field with the same key.
 func (b *InstrumentationRuleApplyConfiguration) WithLabels(entries map[string]string) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *InstrumentationRuleApplyConfiguration) WithLabels(entries map[string]st
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *InstrumentationRuleApplyConfiguration) WithAnnotations(entries map[string]string) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithOwnerReferences(values ...*v
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *InstrumentationRuleApplyConfiguration) WithOwnerReferences(values ...*v
 func (b *InstrumentationRuleApplyConfiguration) WithFinalizers(values ...string) *InstrumentationRuleApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *InstrumentationRuleApplyConfiguration) WithStatus(value *Instrumentatio
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *InstrumentationRuleApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentedapplication.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentedapplication.go
index 5b60d9c34b..853f7f1e05 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentedapplication.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/instrumentedapplication.go
@@ -47,7 +47,7 @@ func InstrumentedApplication(name, namespace string) *InstrumentedApplicationApp
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithKind(value string) *InstrumentedApplicationApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithKind(value string) *Inst
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithAPIVersion(value string) *InstrumentedApplicationApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithAPIVersion(value string)
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithName(value string) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithName(value string) *Inst
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithGenerateName(value string) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithGenerateName(value strin
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithNamespace(value string) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithNamespace(value string)
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithUID(value types.UID) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithUID(value types.UID) *In
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithResourceVersion(value string) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithResourceVersion(value st
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithGeneration(value int64) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithGeneration(value int64)
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithCreationTimestamp(value metav1.Time) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithCreationTimestamp(value
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithDeletionTimestamp(value
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *InstrumentedApplicationApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *InstrumentedApplicationApplyConfiguration) WithDeletionGracePeriodSecon
 // overwriting an existing map entries in Labels field with the same key.
 func (b *InstrumentedApplicationApplyConfiguration) WithLabels(entries map[string]string) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *InstrumentedApplicationApplyConfiguration) WithLabels(entries map[strin
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *InstrumentedApplicationApplyConfiguration) WithAnnotations(entries map[string]string) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithOwnerReferences(values .
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *InstrumentedApplicationApplyConfiguration) WithOwnerReferences(values .
 func (b *InstrumentedApplicationApplyConfiguration) WithFinalizers(values ...string) *InstrumentedApplicationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *InstrumentedApplicationApplyConfiguration) WithStatus(value *Instrument
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *InstrumentedApplicationApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/odigosconfiguration.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/odigosconfiguration.go
index b12b721b6a..a3ec8f7919 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/odigosconfiguration.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/odigosconfiguration.go
@@ -46,7 +46,7 @@ func OdigosConfiguration(name, namespace string) *OdigosConfigurationApplyConfig
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithKind(value string) *OdigosConfigurationApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -54,7 +54,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithKind(value string) *OdigosCo
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithAPIVersion(value string) *OdigosConfigurationApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -63,7 +63,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithAPIVersion(value string) *Od
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithName(value string) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -72,7 +72,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithName(value string) *OdigosCo
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithGenerateName(value string) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -81,7 +81,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithGenerateName(value string) *
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithNamespace(value string) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -90,7 +90,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithNamespace(value string) *Odi
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithUID(value types.UID) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -99,7 +99,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithUID(value types.UID) *Odigos
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithResourceVersion(value string) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -108,7 +108,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithResourceVersion(value string
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithGeneration(value int64) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -117,7 +117,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithGeneration(value int64) *Odi
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithCreationTimestamp(value metav1.Time) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -126,7 +126,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithCreationTimestamp(value meta
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -135,7 +135,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithDeletionTimestamp(value meta
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *OdigosConfigurationApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -145,11 +145,11 @@ func (b *OdigosConfigurationApplyConfiguration) WithDeletionGracePeriodSeconds(v
 // overwriting an existing map entries in Labels field with the same key.
 func (b *OdigosConfigurationApplyConfiguration) WithLabels(entries map[string]string) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -160,11 +160,11 @@ func (b *OdigosConfigurationApplyConfiguration) WithLabels(entries map[string]st
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *OdigosConfigurationApplyConfiguration) WithAnnotations(entries map[string]string) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -178,7 +178,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithOwnerReferences(values ...*v
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -189,7 +189,7 @@ func (b *OdigosConfigurationApplyConfiguration) WithOwnerReferences(values ...*v
 func (b *OdigosConfigurationApplyConfiguration) WithFinalizers(values ...string) *OdigosConfigurationApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -211,5 +211,5 @@ func (b *OdigosConfigurationApplyConfiguration) WithSpec(value *OdigosConfigurat
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *OdigosConfigurationApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processor.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processor.go
index 3afd8bcb2c..081d7cb4af 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processor.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processor.go
@@ -48,7 +48,7 @@ func Processor(name, namespace string) *ProcessorApplyConfiguration {
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithKind(value string) *ProcessorApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -56,7 +56,7 @@ func (b *ProcessorApplyConfiguration) WithKind(value string) *ProcessorApplyConf
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithAPIVersion(value string) *ProcessorApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -65,7 +65,7 @@ func (b *ProcessorApplyConfiguration) WithAPIVersion(value string) *ProcessorApp
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithName(value string) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -74,7 +74,7 @@ func (b *ProcessorApplyConfiguration) WithName(value string) *ProcessorApplyConf
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithGenerateName(value string) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -83,7 +83,7 @@ func (b *ProcessorApplyConfiguration) WithGenerateName(value string) *ProcessorA
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithNamespace(value string) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -92,7 +92,7 @@ func (b *ProcessorApplyConfiguration) WithNamespace(value string) *ProcessorAppl
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithUID(value types.UID) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -101,7 +101,7 @@ func (b *ProcessorApplyConfiguration) WithUID(value types.UID) *ProcessorApplyCo
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithResourceVersion(value string) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -110,7 +110,7 @@ func (b *ProcessorApplyConfiguration) WithResourceVersion(value string) *Process
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithGeneration(value int64) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -119,7 +119,7 @@ func (b *ProcessorApplyConfiguration) WithGeneration(value int64) *ProcessorAppl
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -128,7 +128,7 @@ func (b *ProcessorApplyConfiguration) WithCreationTimestamp(value metav1.Time) *
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -137,7 +137,7 @@ func (b *ProcessorApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *ProcessorApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -147,11 +147,11 @@ func (b *ProcessorApplyConfiguration) WithDeletionGracePeriodSeconds(value int64
 // overwriting an existing map entries in Labels field with the same key.
 func (b *ProcessorApplyConfiguration) WithLabels(entries map[string]string) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -162,11 +162,11 @@ func (b *ProcessorApplyConfiguration) WithLabels(entries map[string]string) *Pro
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *ProcessorApplyConfiguration) WithAnnotations(entries map[string]string) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -180,7 +180,7 @@ func (b *ProcessorApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -191,7 +191,7 @@ func (b *ProcessorApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef
 func (b *ProcessorApplyConfiguration) WithFinalizers(values ...string) *ProcessorApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -221,5 +221,5 @@ func (b *ProcessorApplyConfiguration) WithStatus(value odigosv1alpha1.ProcessorS
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *ProcessorApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processorspec.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processorspec.go
index 3f6a7ff0b5..2bd45b94b3 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processorspec.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/processorspec.go
@@ -18,7 +18,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	common "github.com/odigos-io/odigos/common"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
@@ -26,14 +26,14 @@ import (
 // ProcessorSpecApplyConfiguration represents a declarative configuration of the ProcessorSpec type for use
 // with apply.
 type ProcessorSpecApplyConfiguration struct {
-	Type            *string                        `json:"type,omitempty"`
-	ProcessorName   *string                        `json:"processorName,omitempty"`
-	Notes           *string                        `json:"notes,omitempty"`
-	Disabled        *bool                          `json:"disabled,omitempty"`
-	Signals         []common.ObservabilitySignal   `json:"signals,omitempty"`
-	CollectorRoles  []v1alpha1.CollectorsGroupRole `json:"collectorRoles,omitempty"`
-	OrderHint       *int                           `json:"orderHint,omitempty"`
-	ProcessorConfig *runtime.RawExtension          `json:"processorConfig,omitempty"`
+	Type            *string                              `json:"type,omitempty"`
+	ProcessorName   *string                              `json:"processorName,omitempty"`
+	Notes           *string                              `json:"notes,omitempty"`
+	Disabled        *bool                                `json:"disabled,omitempty"`
+	Signals         []common.ObservabilitySignal         `json:"signals,omitempty"`
+	CollectorRoles  []odigosv1alpha1.CollectorsGroupRole `json:"collectorRoles,omitempty"`
+	OrderHint       *int                                 `json:"orderHint,omitempty"`
+	ProcessorConfig *runtime.RawExtension                `json:"processorConfig,omitempty"`
 }
 
 // ProcessorSpecApplyConfiguration constructs a declarative configuration of the ProcessorSpec type for use with
@@ -87,7 +87,7 @@ func (b *ProcessorSpecApplyConfiguration) WithSignals(values ...common.Observabi
 // WithCollectorRoles adds the given value to the CollectorRoles field in the declarative configuration
 // and returns the receiver, so that objects can be build by chaining "With" function invocations.
 // If called multiple times, values provided by each call will be appended to the CollectorRoles field.
-func (b *ProcessorSpecApplyConfiguration) WithCollectorRoles(values ...v1alpha1.CollectorsGroupRole) *ProcessorSpecApplyConfiguration {
+func (b *ProcessorSpecApplyConfiguration) WithCollectorRoles(values ...odigosv1alpha1.CollectorsGroupRole) *ProcessorSpecApplyConfiguration {
 	for i := range values {
 		b.CollectorRoles = append(b.CollectorRoles, values[i])
 	}
diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/source.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/source.go
index 4a706aee61..7a145b4a2e 100644
--- a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/source.go
+++ b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/source.go
@@ -47,7 +47,7 @@ func Source(name, namespace string) *SourceApplyConfiguration {
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Kind field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithKind(value string) *SourceApplyConfiguration {
-	b.Kind = &value
+	b.TypeMetaApplyConfiguration.Kind = &value
 	return b
 }
 
@@ -55,7 +55,7 @@ func (b *SourceApplyConfiguration) WithKind(value string) *SourceApplyConfigurat
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the APIVersion field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithAPIVersion(value string) *SourceApplyConfiguration {
-	b.APIVersion = &value
+	b.TypeMetaApplyConfiguration.APIVersion = &value
 	return b
 }
 
@@ -64,7 +64,7 @@ func (b *SourceApplyConfiguration) WithAPIVersion(value string) *SourceApplyConf
 // If called multiple times, the Name field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithName(value string) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Name = &value
+	b.ObjectMetaApplyConfiguration.Name = &value
 	return b
 }
 
@@ -73,7 +73,7 @@ func (b *SourceApplyConfiguration) WithName(value string) *SourceApplyConfigurat
 // If called multiple times, the GenerateName field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithGenerateName(value string) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.GenerateName = &value
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
 	return b
 }
 
@@ -82,7 +82,7 @@ func (b *SourceApplyConfiguration) WithGenerateName(value string) *SourceApplyCo
 // If called multiple times, the Namespace field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithNamespace(value string) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Namespace = &value
+	b.ObjectMetaApplyConfiguration.Namespace = &value
 	return b
 }
 
@@ -91,7 +91,7 @@ func (b *SourceApplyConfiguration) WithNamespace(value string) *SourceApplyConfi
 // If called multiple times, the UID field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithUID(value types.UID) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.UID = &value
+	b.ObjectMetaApplyConfiguration.UID = &value
 	return b
 }
 
@@ -100,7 +100,7 @@ func (b *SourceApplyConfiguration) WithUID(value types.UID) *SourceApplyConfigur
 // If called multiple times, the ResourceVersion field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithResourceVersion(value string) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.ResourceVersion = &value
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
 	return b
 }
 
@@ -109,7 +109,7 @@ func (b *SourceApplyConfiguration) WithResourceVersion(value string) *SourceAppl
 // If called multiple times, the Generation field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithGeneration(value int64) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.Generation = &value
+	b.ObjectMetaApplyConfiguration.Generation = &value
 	return b
 }
 
@@ -118,7 +118,7 @@ func (b *SourceApplyConfiguration) WithGeneration(value int64) *SourceApplyConfi
 // If called multiple times, the CreationTimestamp field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithCreationTimestamp(value metav1.Time) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.CreationTimestamp = &value
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
 	return b
 }
 
@@ -127,7 +127,7 @@ func (b *SourceApplyConfiguration) WithCreationTimestamp(value metav1.Time) *Sou
 // If called multiple times, the DeletionTimestamp field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionTimestamp = &value
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
 	return b
 }
 
@@ -136,7 +136,7 @@ func (b *SourceApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Sou
 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
 func (b *SourceApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	b.DeletionGracePeriodSeconds = &value
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
 	return b
 }
 
@@ -146,11 +146,11 @@ func (b *SourceApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *
 // overwriting an existing map entries in Labels field with the same key.
 func (b *SourceApplyConfiguration) WithLabels(entries map[string]string) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Labels == nil && len(entries) > 0 {
-		b.Labels = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Labels[k] = v
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
 	}
 	return b
 }
@@ -161,11 +161,11 @@ func (b *SourceApplyConfiguration) WithLabels(entries map[string]string) *Source
 // overwriting an existing map entries in Annotations field with the same key.
 func (b *SourceApplyConfiguration) WithAnnotations(entries map[string]string) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
-	if b.Annotations == nil && len(entries) > 0 {
-		b.Annotations = make(map[string]string, len(entries))
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
 	}
 	for k, v := range entries {
-		b.Annotations[k] = v
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
 	}
 	return b
 }
@@ -179,7 +179,7 @@ func (b *SourceApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefere
 		if values[i] == nil {
 			panic("nil value passed to WithOwnerReferences")
 		}
-		b.OwnerReferences = append(b.OwnerReferences, *values[i])
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
 	}
 	return b
 }
@@ -190,7 +190,7 @@ func (b *SourceApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefere
 func (b *SourceApplyConfiguration) WithFinalizers(values ...string) *SourceApplyConfiguration {
 	b.ensureObjectMetaApplyConfigurationExists()
 	for i := range values {
-		b.Finalizers = append(b.Finalizers, values[i])
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
 	}
 	return b
 }
@@ -220,5 +220,5 @@ func (b *SourceApplyConfiguration) WithStatus(value *SourceStatusApplyConfigurat
 // GetName retrieves the value of the Name field in the declarative configuration.
 func (b *SourceApplyConfiguration) GetName() *string {
 	b.ensureObjectMetaApplyConfigurationExists()
-	return b.Name
+	return b.ObjectMetaApplyConfiguration.Name
 }
diff --git a/api/generated/odigos/clientset/versioned/clientset.go b/api/generated/odigos/clientset/versioned/clientset.go
index 9f923bf1e2..92a9532b0c 100644
--- a/api/generated/odigos/clientset/versioned/clientset.go
+++ b/api/generated/odigos/clientset/versioned/clientset.go
@@ -18,8 +18,8 @@ limitations under the License.
 package versioned
 
 import (
-	"fmt"
-	"net/http"
+	fmt "fmt"
+	http "net/http"
 
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	discovery "k8s.io/client-go/discovery"
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/collectorsgroup.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/collectorsgroup.go
index 941ca0f614..dc7223666a 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/collectorsgroup.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/collectorsgroup.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,37 @@ type CollectorsGroupsGetter interface {
 
 // CollectorsGroupInterface has methods to work with CollectorsGroup resources.
 type CollectorsGroupInterface interface {
-	Create(ctx context.Context, collectorsGroup *v1alpha1.CollectorsGroup, opts v1.CreateOptions) (*v1alpha1.CollectorsGroup, error)
-	Update(ctx context.Context, collectorsGroup *v1alpha1.CollectorsGroup, opts v1.UpdateOptions) (*v1alpha1.CollectorsGroup, error)
+	Create(ctx context.Context, collectorsGroup *odigosv1alpha1.CollectorsGroup, opts v1.CreateOptions) (*odigosv1alpha1.CollectorsGroup, error)
+	Update(ctx context.Context, collectorsGroup *odigosv1alpha1.CollectorsGroup, opts v1.UpdateOptions) (*odigosv1alpha1.CollectorsGroup, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, collectorsGroup *v1alpha1.CollectorsGroup, opts v1.UpdateOptions) (*v1alpha1.CollectorsGroup, error)
+	UpdateStatus(ctx context.Context, collectorsGroup *odigosv1alpha1.CollectorsGroup, opts v1.UpdateOptions) (*odigosv1alpha1.CollectorsGroup, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.CollectorsGroup, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.CollectorsGroupList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.CollectorsGroup, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.CollectorsGroupList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.CollectorsGroup, err error)
-	Apply(ctx context.Context, collectorsGroup *odigosv1alpha1.CollectorsGroupApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.CollectorsGroup, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.CollectorsGroup, err error)
+	Apply(ctx context.Context, collectorsGroup *applyconfigurationodigosv1alpha1.CollectorsGroupApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.CollectorsGroup, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, collectorsGroup *odigosv1alpha1.CollectorsGroupApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.CollectorsGroup, err error)
+	ApplyStatus(ctx context.Context, collectorsGroup *applyconfigurationodigosv1alpha1.CollectorsGroupApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.CollectorsGroup, err error)
 	CollectorsGroupExpansion
 }
 
 // collectorsGroups implements CollectorsGroupInterface
 type collectorsGroups struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.CollectorsGroup, *v1alpha1.CollectorsGroupList, *odigosv1alpha1.CollectorsGroupApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.CollectorsGroup, *odigosv1alpha1.CollectorsGroupList, *applyconfigurationodigosv1alpha1.CollectorsGroupApplyConfiguration]
 }
 
 // newCollectorsGroups returns a CollectorsGroups
 func newCollectorsGroups(c *OdigosV1alpha1Client, namespace string) *collectorsGroups {
 	return &collectorsGroups{
-		gentype.NewClientWithListAndApply[*v1alpha1.CollectorsGroup, *v1alpha1.CollectorsGroupList, *odigosv1alpha1.CollectorsGroupApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.CollectorsGroup, *odigosv1alpha1.CollectorsGroupList, *applyconfigurationodigosv1alpha1.CollectorsGroupApplyConfiguration](
 			"collectorsgroups",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.CollectorsGroup { return &v1alpha1.CollectorsGroup{} },
-			func() *v1alpha1.CollectorsGroupList { return &v1alpha1.CollectorsGroupList{} }),
+			func() *odigosv1alpha1.CollectorsGroup { return &odigosv1alpha1.CollectorsGroup{} },
+			func() *odigosv1alpha1.CollectorsGroupList { return &odigosv1alpha1.CollectorsGroupList{} },
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/destination.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/destination.go
index 14c2c790db..237eaf5795 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/destination.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/destination.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,37 @@ type DestinationsGetter interface {
 
 // DestinationInterface has methods to work with Destination resources.
 type DestinationInterface interface {
-	Create(ctx context.Context, destination *v1alpha1.Destination, opts v1.CreateOptions) (*v1alpha1.Destination, error)
-	Update(ctx context.Context, destination *v1alpha1.Destination, opts v1.UpdateOptions) (*v1alpha1.Destination, error)
+	Create(ctx context.Context, destination *odigosv1alpha1.Destination, opts v1.CreateOptions) (*odigosv1alpha1.Destination, error)
+	Update(ctx context.Context, destination *odigosv1alpha1.Destination, opts v1.UpdateOptions) (*odigosv1alpha1.Destination, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, destination *v1alpha1.Destination, opts v1.UpdateOptions) (*v1alpha1.Destination, error)
+	UpdateStatus(ctx context.Context, destination *odigosv1alpha1.Destination, opts v1.UpdateOptions) (*odigosv1alpha1.Destination, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Destination, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.DestinationList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.Destination, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.DestinationList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Destination, err error)
-	Apply(ctx context.Context, destination *odigosv1alpha1.DestinationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Destination, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.Destination, err error)
+	Apply(ctx context.Context, destination *applyconfigurationodigosv1alpha1.DestinationApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.Destination, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, destination *odigosv1alpha1.DestinationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Destination, err error)
+	ApplyStatus(ctx context.Context, destination *applyconfigurationodigosv1alpha1.DestinationApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.Destination, err error)
 	DestinationExpansion
 }
 
 // destinations implements DestinationInterface
 type destinations struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.Destination, *v1alpha1.DestinationList, *odigosv1alpha1.DestinationApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.Destination, *odigosv1alpha1.DestinationList, *applyconfigurationodigosv1alpha1.DestinationApplyConfiguration]
 }
 
 // newDestinations returns a Destinations
 func newDestinations(c *OdigosV1alpha1Client, namespace string) *destinations {
 	return &destinations{
-		gentype.NewClientWithListAndApply[*v1alpha1.Destination, *v1alpha1.DestinationList, *odigosv1alpha1.DestinationApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.Destination, *odigosv1alpha1.DestinationList, *applyconfigurationodigosv1alpha1.DestinationApplyConfiguration](
 			"destinations",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.Destination { return &v1alpha1.Destination{} },
-			func() *v1alpha1.DestinationList { return &v1alpha1.DestinationList{} }),
+			func() *odigosv1alpha1.Destination { return &odigosv1alpha1.Destination{} },
+			func() *odigosv1alpha1.DestinationList { return &odigosv1alpha1.DestinationList{} },
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_collectorsgroup.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_collectorsgroup.go
index 96da2750ca..7fd71076a4 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_collectorsgroup.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_collectorsgroup.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeCollectorsGroups implements CollectorsGroupInterface
-type FakeCollectorsGroups struct {
+// fakeCollectorsGroups implements CollectorsGroupInterface
+type fakeCollectorsGroups struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.CollectorsGroup, *v1alpha1.CollectorsGroupList, *odigosv1alpha1.CollectorsGroupApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var collectorsgroupsResource = v1alpha1.SchemeGroupVersion.WithResource("collectorsgroups")
-
-var collectorsgroupsKind = v1alpha1.SchemeGroupVersion.WithKind("CollectorsGroup")
-
-// Get takes name of the collectorsGroup, and returns the corresponding collectorsGroup object, and an error if there is any.
-func (c *FakeCollectorsGroups) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.CollectorsGroup, err error) {
-	emptyResult := &v1alpha1.CollectorsGroup{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(collectorsgroupsResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.CollectorsGroup), err
-}
-
-// List takes label and field selectors, and returns the list of CollectorsGroups that match those selectors.
-func (c *FakeCollectorsGroups) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.CollectorsGroupList, err error) {
-	emptyResult := &v1alpha1.CollectorsGroupList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(collectorsgroupsResource, collectorsgroupsKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.CollectorsGroupList{ListMeta: obj.(*v1alpha1.CollectorsGroupList).ListMeta}
-	for _, item := range obj.(*v1alpha1.CollectorsGroupList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested collectorsGroups.
-func (c *FakeCollectorsGroups) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(collectorsgroupsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a collectorsGroup and creates it.  Returns the server's representation of the collectorsGroup, and an error, if there is any.
-func (c *FakeCollectorsGroups) Create(ctx context.Context, collectorsGroup *v1alpha1.CollectorsGroup, opts v1.CreateOptions) (result *v1alpha1.CollectorsGroup, err error) {
-	emptyResult := &v1alpha1.CollectorsGroup{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(collectorsgroupsResource, c.ns, collectorsGroup, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.CollectorsGroup), err
-}
-
-// Update takes the representation of a collectorsGroup and updates it. Returns the server's representation of the collectorsGroup, and an error, if there is any.
-func (c *FakeCollectorsGroups) Update(ctx context.Context, collectorsGroup *v1alpha1.CollectorsGroup, opts v1.UpdateOptions) (result *v1alpha1.CollectorsGroup, err error) {
-	emptyResult := &v1alpha1.CollectorsGroup{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(collectorsgroupsResource, c.ns, collectorsGroup, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.CollectorsGroup), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeCollectorsGroups) UpdateStatus(ctx context.Context, collectorsGroup *v1alpha1.CollectorsGroup, opts v1.UpdateOptions) (result *v1alpha1.CollectorsGroup, err error) {
-	emptyResult := &v1alpha1.CollectorsGroup{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(collectorsgroupsResource, "status", c.ns, collectorsGroup, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.CollectorsGroup), err
-}
-
-// Delete takes name of the collectorsGroup and deletes it. Returns an error if one occurs.
-func (c *FakeCollectorsGroups) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(collectorsgroupsResource, c.ns, name, opts), &v1alpha1.CollectorsGroup{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeCollectorsGroups) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(collectorsgroupsResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.CollectorsGroupList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched collectorsGroup.
-func (c *FakeCollectorsGroups) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.CollectorsGroup, err error) {
-	emptyResult := &v1alpha1.CollectorsGroup{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(collectorsgroupsResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.CollectorsGroup), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied collectorsGroup.
-func (c *FakeCollectorsGroups) Apply(ctx context.Context, collectorsGroup *odigosv1alpha1.CollectorsGroupApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.CollectorsGroup, err error) {
-	if collectorsGroup == nil {
-		return nil, fmt.Errorf("collectorsGroup provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(collectorsGroup)
-	if err != nil {
-		return nil, err
-	}
-	name := collectorsGroup.Name
-	if name == nil {
-		return nil, fmt.Errorf("collectorsGroup.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.CollectorsGroup{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(collectorsgroupsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.CollectorsGroup), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeCollectorsGroups) ApplyStatus(ctx context.Context, collectorsGroup *odigosv1alpha1.CollectorsGroupApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.CollectorsGroup, err error) {
-	if collectorsGroup == nil {
-		return nil, fmt.Errorf("collectorsGroup provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(collectorsGroup)
-	if err != nil {
-		return nil, err
-	}
-	name := collectorsGroup.Name
-	if name == nil {
-		return nil, fmt.Errorf("collectorsGroup.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.CollectorsGroup{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(collectorsgroupsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeCollectorsGroups(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.CollectorsGroupInterface {
+	return &fakeCollectorsGroups{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.CollectorsGroup, *v1alpha1.CollectorsGroupList, *odigosv1alpha1.CollectorsGroupApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("collectorsgroups"),
+			v1alpha1.SchemeGroupVersion.WithKind("CollectorsGroup"),
+			func() *v1alpha1.CollectorsGroup { return &v1alpha1.CollectorsGroup{} },
+			func() *v1alpha1.CollectorsGroupList { return &v1alpha1.CollectorsGroupList{} },
+			func(dst, src *v1alpha1.CollectorsGroupList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.CollectorsGroupList) []*v1alpha1.CollectorsGroup {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.CollectorsGroupList, items []*v1alpha1.CollectorsGroup) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.CollectorsGroup), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_destination.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_destination.go
index f25827a325..ed49c5b1a1 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_destination.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_destination.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeDestinations implements DestinationInterface
-type FakeDestinations struct {
+// fakeDestinations implements DestinationInterface
+type fakeDestinations struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.Destination, *v1alpha1.DestinationList, *odigosv1alpha1.DestinationApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var destinationsResource = v1alpha1.SchemeGroupVersion.WithResource("destinations")
-
-var destinationsKind = v1alpha1.SchemeGroupVersion.WithKind("Destination")
-
-// Get takes name of the destination, and returns the corresponding destination object, and an error if there is any.
-func (c *FakeDestinations) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Destination, err error) {
-	emptyResult := &v1alpha1.Destination{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(destinationsResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Destination), err
-}
-
-// List takes label and field selectors, and returns the list of Destinations that match those selectors.
-func (c *FakeDestinations) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.DestinationList, err error) {
-	emptyResult := &v1alpha1.DestinationList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(destinationsResource, destinationsKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.DestinationList{ListMeta: obj.(*v1alpha1.DestinationList).ListMeta}
-	for _, item := range obj.(*v1alpha1.DestinationList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested destinations.
-func (c *FakeDestinations) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(destinationsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a destination and creates it.  Returns the server's representation of the destination, and an error, if there is any.
-func (c *FakeDestinations) Create(ctx context.Context, destination *v1alpha1.Destination, opts v1.CreateOptions) (result *v1alpha1.Destination, err error) {
-	emptyResult := &v1alpha1.Destination{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(destinationsResource, c.ns, destination, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Destination), err
-}
-
-// Update takes the representation of a destination and updates it. Returns the server's representation of the destination, and an error, if there is any.
-func (c *FakeDestinations) Update(ctx context.Context, destination *v1alpha1.Destination, opts v1.UpdateOptions) (result *v1alpha1.Destination, err error) {
-	emptyResult := &v1alpha1.Destination{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(destinationsResource, c.ns, destination, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Destination), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeDestinations) UpdateStatus(ctx context.Context, destination *v1alpha1.Destination, opts v1.UpdateOptions) (result *v1alpha1.Destination, err error) {
-	emptyResult := &v1alpha1.Destination{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(destinationsResource, "status", c.ns, destination, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Destination), err
-}
-
-// Delete takes name of the destination and deletes it. Returns an error if one occurs.
-func (c *FakeDestinations) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(destinationsResource, c.ns, name, opts), &v1alpha1.Destination{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeDestinations) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(destinationsResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.DestinationList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched destination.
-func (c *FakeDestinations) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Destination, err error) {
-	emptyResult := &v1alpha1.Destination{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(destinationsResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Destination), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied destination.
-func (c *FakeDestinations) Apply(ctx context.Context, destination *odigosv1alpha1.DestinationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Destination, err error) {
-	if destination == nil {
-		return nil, fmt.Errorf("destination provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(destination)
-	if err != nil {
-		return nil, err
-	}
-	name := destination.Name
-	if name == nil {
-		return nil, fmt.Errorf("destination.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.Destination{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(destinationsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Destination), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeDestinations) ApplyStatus(ctx context.Context, destination *odigosv1alpha1.DestinationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Destination, err error) {
-	if destination == nil {
-		return nil, fmt.Errorf("destination provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(destination)
-	if err != nil {
-		return nil, err
-	}
-	name := destination.Name
-	if name == nil {
-		return nil, fmt.Errorf("destination.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.Destination{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(destinationsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeDestinations(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.DestinationInterface {
+	return &fakeDestinations{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.Destination, *v1alpha1.DestinationList, *odigosv1alpha1.DestinationApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("destinations"),
+			v1alpha1.SchemeGroupVersion.WithKind("Destination"),
+			func() *v1alpha1.Destination { return &v1alpha1.Destination{} },
+			func() *v1alpha1.DestinationList { return &v1alpha1.DestinationList{} },
+			func(dst, src *v1alpha1.DestinationList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.DestinationList) []*v1alpha1.Destination {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.DestinationList, items []*v1alpha1.Destination) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.Destination), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationconfig.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationconfig.go
index bca4782877..36959dc68e 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationconfig.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationconfig.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeInstrumentationConfigs implements InstrumentationConfigInterface
-type FakeInstrumentationConfigs struct {
+// fakeInstrumentationConfigs implements InstrumentationConfigInterface
+type fakeInstrumentationConfigs struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.InstrumentationConfig, *v1alpha1.InstrumentationConfigList, *odigosv1alpha1.InstrumentationConfigApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var instrumentationconfigsResource = v1alpha1.SchemeGroupVersion.WithResource("instrumentationconfigs")
-
-var instrumentationconfigsKind = v1alpha1.SchemeGroupVersion.WithKind("InstrumentationConfig")
-
-// Get takes name of the instrumentationConfig, and returns the corresponding instrumentationConfig object, and an error if there is any.
-func (c *FakeInstrumentationConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.InstrumentationConfig, err error) {
-	emptyResult := &v1alpha1.InstrumentationConfig{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(instrumentationconfigsResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationConfig), err
-}
-
-// List takes label and field selectors, and returns the list of InstrumentationConfigs that match those selectors.
-func (c *FakeInstrumentationConfigs) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.InstrumentationConfigList, err error) {
-	emptyResult := &v1alpha1.InstrumentationConfigList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(instrumentationconfigsResource, instrumentationconfigsKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.InstrumentationConfigList{ListMeta: obj.(*v1alpha1.InstrumentationConfigList).ListMeta}
-	for _, item := range obj.(*v1alpha1.InstrumentationConfigList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested instrumentationConfigs.
-func (c *FakeInstrumentationConfigs) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(instrumentationconfigsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a instrumentationConfig and creates it.  Returns the server's representation of the instrumentationConfig, and an error, if there is any.
-func (c *FakeInstrumentationConfigs) Create(ctx context.Context, instrumentationConfig *v1alpha1.InstrumentationConfig, opts v1.CreateOptions) (result *v1alpha1.InstrumentationConfig, err error) {
-	emptyResult := &v1alpha1.InstrumentationConfig{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(instrumentationconfigsResource, c.ns, instrumentationConfig, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationConfig), err
-}
-
-// Update takes the representation of a instrumentationConfig and updates it. Returns the server's representation of the instrumentationConfig, and an error, if there is any.
-func (c *FakeInstrumentationConfigs) Update(ctx context.Context, instrumentationConfig *v1alpha1.InstrumentationConfig, opts v1.UpdateOptions) (result *v1alpha1.InstrumentationConfig, err error) {
-	emptyResult := &v1alpha1.InstrumentationConfig{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(instrumentationconfigsResource, c.ns, instrumentationConfig, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationConfig), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeInstrumentationConfigs) UpdateStatus(ctx context.Context, instrumentationConfig *v1alpha1.InstrumentationConfig, opts v1.UpdateOptions) (result *v1alpha1.InstrumentationConfig, err error) {
-	emptyResult := &v1alpha1.InstrumentationConfig{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(instrumentationconfigsResource, "status", c.ns, instrumentationConfig, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationConfig), err
-}
-
-// Delete takes name of the instrumentationConfig and deletes it. Returns an error if one occurs.
-func (c *FakeInstrumentationConfigs) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(instrumentationconfigsResource, c.ns, name, opts), &v1alpha1.InstrumentationConfig{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeInstrumentationConfigs) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(instrumentationconfigsResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.InstrumentationConfigList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched instrumentationConfig.
-func (c *FakeInstrumentationConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentationConfig, err error) {
-	emptyResult := &v1alpha1.InstrumentationConfig{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationconfigsResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationConfig), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied instrumentationConfig.
-func (c *FakeInstrumentationConfigs) Apply(ctx context.Context, instrumentationConfig *odigosv1alpha1.InstrumentationConfigApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationConfig, err error) {
-	if instrumentationConfig == nil {
-		return nil, fmt.Errorf("instrumentationConfig provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentationConfig)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentationConfig.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentationConfig.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentationConfig{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationconfigsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationConfig), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeInstrumentationConfigs) ApplyStatus(ctx context.Context, instrumentationConfig *odigosv1alpha1.InstrumentationConfigApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationConfig, err error) {
-	if instrumentationConfig == nil {
-		return nil, fmt.Errorf("instrumentationConfig provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentationConfig)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentationConfig.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentationConfig.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentationConfig{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationconfigsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeInstrumentationConfigs(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.InstrumentationConfigInterface {
+	return &fakeInstrumentationConfigs{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.InstrumentationConfig, *v1alpha1.InstrumentationConfigList, *odigosv1alpha1.InstrumentationConfigApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("instrumentationconfigs"),
+			v1alpha1.SchemeGroupVersion.WithKind("InstrumentationConfig"),
+			func() *v1alpha1.InstrumentationConfig { return &v1alpha1.InstrumentationConfig{} },
+			func() *v1alpha1.InstrumentationConfigList { return &v1alpha1.InstrumentationConfigList{} },
+			func(dst, src *v1alpha1.InstrumentationConfigList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.InstrumentationConfigList) []*v1alpha1.InstrumentationConfig {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.InstrumentationConfigList, items []*v1alpha1.InstrumentationConfig) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.InstrumentationConfig), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationinstance.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationinstance.go
index e3c507c8c6..20983a56bf 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationinstance.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationinstance.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeInstrumentationInstances implements InstrumentationInstanceInterface
-type FakeInstrumentationInstances struct {
+// fakeInstrumentationInstances implements InstrumentationInstanceInterface
+type fakeInstrumentationInstances struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.InstrumentationInstance, *v1alpha1.InstrumentationInstanceList, *odigosv1alpha1.InstrumentationInstanceApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var instrumentationinstancesResource = v1alpha1.SchemeGroupVersion.WithResource("instrumentationinstances")
-
-var instrumentationinstancesKind = v1alpha1.SchemeGroupVersion.WithKind("InstrumentationInstance")
-
-// Get takes name of the instrumentationInstance, and returns the corresponding instrumentationInstance object, and an error if there is any.
-func (c *FakeInstrumentationInstances) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.InstrumentationInstance, err error) {
-	emptyResult := &v1alpha1.InstrumentationInstance{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(instrumentationinstancesResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationInstance), err
-}
-
-// List takes label and field selectors, and returns the list of InstrumentationInstances that match those selectors.
-func (c *FakeInstrumentationInstances) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.InstrumentationInstanceList, err error) {
-	emptyResult := &v1alpha1.InstrumentationInstanceList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(instrumentationinstancesResource, instrumentationinstancesKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.InstrumentationInstanceList{ListMeta: obj.(*v1alpha1.InstrumentationInstanceList).ListMeta}
-	for _, item := range obj.(*v1alpha1.InstrumentationInstanceList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested instrumentationInstances.
-func (c *FakeInstrumentationInstances) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(instrumentationinstancesResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a instrumentationInstance and creates it.  Returns the server's representation of the instrumentationInstance, and an error, if there is any.
-func (c *FakeInstrumentationInstances) Create(ctx context.Context, instrumentationInstance *v1alpha1.InstrumentationInstance, opts v1.CreateOptions) (result *v1alpha1.InstrumentationInstance, err error) {
-	emptyResult := &v1alpha1.InstrumentationInstance{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(instrumentationinstancesResource, c.ns, instrumentationInstance, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationInstance), err
-}
-
-// Update takes the representation of a instrumentationInstance and updates it. Returns the server's representation of the instrumentationInstance, and an error, if there is any.
-func (c *FakeInstrumentationInstances) Update(ctx context.Context, instrumentationInstance *v1alpha1.InstrumentationInstance, opts v1.UpdateOptions) (result *v1alpha1.InstrumentationInstance, err error) {
-	emptyResult := &v1alpha1.InstrumentationInstance{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(instrumentationinstancesResource, c.ns, instrumentationInstance, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationInstance), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeInstrumentationInstances) UpdateStatus(ctx context.Context, instrumentationInstance *v1alpha1.InstrumentationInstance, opts v1.UpdateOptions) (result *v1alpha1.InstrumentationInstance, err error) {
-	emptyResult := &v1alpha1.InstrumentationInstance{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(instrumentationinstancesResource, "status", c.ns, instrumentationInstance, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationInstance), err
-}
-
-// Delete takes name of the instrumentationInstance and deletes it. Returns an error if one occurs.
-func (c *FakeInstrumentationInstances) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(instrumentationinstancesResource, c.ns, name, opts), &v1alpha1.InstrumentationInstance{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeInstrumentationInstances) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(instrumentationinstancesResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.InstrumentationInstanceList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched instrumentationInstance.
-func (c *FakeInstrumentationInstances) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentationInstance, err error) {
-	emptyResult := &v1alpha1.InstrumentationInstance{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationinstancesResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationInstance), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied instrumentationInstance.
-func (c *FakeInstrumentationInstances) Apply(ctx context.Context, instrumentationInstance *odigosv1alpha1.InstrumentationInstanceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationInstance, err error) {
-	if instrumentationInstance == nil {
-		return nil, fmt.Errorf("instrumentationInstance provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentationInstance)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentationInstance.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentationInstance.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentationInstance{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationinstancesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationInstance), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeInstrumentationInstances) ApplyStatus(ctx context.Context, instrumentationInstance *odigosv1alpha1.InstrumentationInstanceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationInstance, err error) {
-	if instrumentationInstance == nil {
-		return nil, fmt.Errorf("instrumentationInstance provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentationInstance)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentationInstance.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentationInstance.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentationInstance{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationinstancesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeInstrumentationInstances(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.InstrumentationInstanceInterface {
+	return &fakeInstrumentationInstances{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.InstrumentationInstance, *v1alpha1.InstrumentationInstanceList, *odigosv1alpha1.InstrumentationInstanceApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("instrumentationinstances"),
+			v1alpha1.SchemeGroupVersion.WithKind("InstrumentationInstance"),
+			func() *v1alpha1.InstrumentationInstance { return &v1alpha1.InstrumentationInstance{} },
+			func() *v1alpha1.InstrumentationInstanceList { return &v1alpha1.InstrumentationInstanceList{} },
+			func(dst, src *v1alpha1.InstrumentationInstanceList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.InstrumentationInstanceList) []*v1alpha1.InstrumentationInstance {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.InstrumentationInstanceList, items []*v1alpha1.InstrumentationInstance) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.InstrumentationInstance), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationrule.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationrule.go
index dff76a9c66..18a53b1cbf 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationrule.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentationrule.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeInstrumentationRules implements InstrumentationRuleInterface
-type FakeInstrumentationRules struct {
+// fakeInstrumentationRules implements InstrumentationRuleInterface
+type fakeInstrumentationRules struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.InstrumentationRule, *v1alpha1.InstrumentationRuleList, *odigosv1alpha1.InstrumentationRuleApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var instrumentationrulesResource = v1alpha1.SchemeGroupVersion.WithResource("instrumentationrules")
-
-var instrumentationrulesKind = v1alpha1.SchemeGroupVersion.WithKind("InstrumentationRule")
-
-// Get takes name of the instrumentationRule, and returns the corresponding instrumentationRule object, and an error if there is any.
-func (c *FakeInstrumentationRules) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.InstrumentationRule, err error) {
-	emptyResult := &v1alpha1.InstrumentationRule{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(instrumentationrulesResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationRule), err
-}
-
-// List takes label and field selectors, and returns the list of InstrumentationRules that match those selectors.
-func (c *FakeInstrumentationRules) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.InstrumentationRuleList, err error) {
-	emptyResult := &v1alpha1.InstrumentationRuleList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(instrumentationrulesResource, instrumentationrulesKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.InstrumentationRuleList{ListMeta: obj.(*v1alpha1.InstrumentationRuleList).ListMeta}
-	for _, item := range obj.(*v1alpha1.InstrumentationRuleList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested instrumentationRules.
-func (c *FakeInstrumentationRules) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(instrumentationrulesResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a instrumentationRule and creates it.  Returns the server's representation of the instrumentationRule, and an error, if there is any.
-func (c *FakeInstrumentationRules) Create(ctx context.Context, instrumentationRule *v1alpha1.InstrumentationRule, opts v1.CreateOptions) (result *v1alpha1.InstrumentationRule, err error) {
-	emptyResult := &v1alpha1.InstrumentationRule{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(instrumentationrulesResource, c.ns, instrumentationRule, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationRule), err
-}
-
-// Update takes the representation of a instrumentationRule and updates it. Returns the server's representation of the instrumentationRule, and an error, if there is any.
-func (c *FakeInstrumentationRules) Update(ctx context.Context, instrumentationRule *v1alpha1.InstrumentationRule, opts v1.UpdateOptions) (result *v1alpha1.InstrumentationRule, err error) {
-	emptyResult := &v1alpha1.InstrumentationRule{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(instrumentationrulesResource, c.ns, instrumentationRule, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationRule), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeInstrumentationRules) UpdateStatus(ctx context.Context, instrumentationRule *v1alpha1.InstrumentationRule, opts v1.UpdateOptions) (result *v1alpha1.InstrumentationRule, err error) {
-	emptyResult := &v1alpha1.InstrumentationRule{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(instrumentationrulesResource, "status", c.ns, instrumentationRule, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationRule), err
-}
-
-// Delete takes name of the instrumentationRule and deletes it. Returns an error if one occurs.
-func (c *FakeInstrumentationRules) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(instrumentationrulesResource, c.ns, name, opts), &v1alpha1.InstrumentationRule{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeInstrumentationRules) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(instrumentationrulesResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.InstrumentationRuleList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched instrumentationRule.
-func (c *FakeInstrumentationRules) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentationRule, err error) {
-	emptyResult := &v1alpha1.InstrumentationRule{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationrulesResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationRule), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied instrumentationRule.
-func (c *FakeInstrumentationRules) Apply(ctx context.Context, instrumentationRule *odigosv1alpha1.InstrumentationRuleApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationRule, err error) {
-	if instrumentationRule == nil {
-		return nil, fmt.Errorf("instrumentationRule provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentationRule)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentationRule.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentationRule.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentationRule{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationrulesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentationRule), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeInstrumentationRules) ApplyStatus(ctx context.Context, instrumentationRule *odigosv1alpha1.InstrumentationRuleApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationRule, err error) {
-	if instrumentationRule == nil {
-		return nil, fmt.Errorf("instrumentationRule provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentationRule)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentationRule.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentationRule.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentationRule{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentationrulesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeInstrumentationRules(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.InstrumentationRuleInterface {
+	return &fakeInstrumentationRules{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.InstrumentationRule, *v1alpha1.InstrumentationRuleList, *odigosv1alpha1.InstrumentationRuleApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("instrumentationrules"),
+			v1alpha1.SchemeGroupVersion.WithKind("InstrumentationRule"),
+			func() *v1alpha1.InstrumentationRule { return &v1alpha1.InstrumentationRule{} },
+			func() *v1alpha1.InstrumentationRuleList { return &v1alpha1.InstrumentationRuleList{} },
+			func(dst, src *v1alpha1.InstrumentationRuleList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.InstrumentationRuleList) []*v1alpha1.InstrumentationRule {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.InstrumentationRuleList, items []*v1alpha1.InstrumentationRule) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.InstrumentationRule), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentedapplication.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentedapplication.go
index fe18c0b315..222948a89f 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentedapplication.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_instrumentedapplication.go
@@ -18,179 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeInstrumentedApplications implements InstrumentedApplicationInterface
-type FakeInstrumentedApplications struct {
+// fakeInstrumentedApplications implements InstrumentedApplicationInterface
+type fakeInstrumentedApplications struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.InstrumentedApplication, *v1alpha1.InstrumentedApplicationList, *odigosv1alpha1.InstrumentedApplicationApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var instrumentedapplicationsResource = v1alpha1.SchemeGroupVersion.WithResource("instrumentedapplications")
-
-var instrumentedapplicationsKind = v1alpha1.SchemeGroupVersion.WithKind("InstrumentedApplication")
-
-// Get takes name of the instrumentedApplication, and returns the corresponding instrumentedApplication object, and an error if there is any.
-func (c *FakeInstrumentedApplications) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.InstrumentedApplication, err error) {
-	emptyResult := &v1alpha1.InstrumentedApplication{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(instrumentedapplicationsResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentedApplication), err
-}
-
-// List takes label and field selectors, and returns the list of InstrumentedApplications that match those selectors.
-func (c *FakeInstrumentedApplications) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.InstrumentedApplicationList, err error) {
-	emptyResult := &v1alpha1.InstrumentedApplicationList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(instrumentedapplicationsResource, instrumentedapplicationsKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.InstrumentedApplicationList{ListMeta: obj.(*v1alpha1.InstrumentedApplicationList).ListMeta}
-	for _, item := range obj.(*v1alpha1.InstrumentedApplicationList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested instrumentedApplications.
-func (c *FakeInstrumentedApplications) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(instrumentedapplicationsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a instrumentedApplication and creates it.  Returns the server's representation of the instrumentedApplication, and an error, if there is any.
-func (c *FakeInstrumentedApplications) Create(ctx context.Context, instrumentedApplication *v1alpha1.InstrumentedApplication, opts v1.CreateOptions) (result *v1alpha1.InstrumentedApplication, err error) {
-	emptyResult := &v1alpha1.InstrumentedApplication{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(instrumentedapplicationsResource, c.ns, instrumentedApplication, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentedApplication), err
-}
-
-// Update takes the representation of a instrumentedApplication and updates it. Returns the server's representation of the instrumentedApplication, and an error, if there is any.
-func (c *FakeInstrumentedApplications) Update(ctx context.Context, instrumentedApplication *v1alpha1.InstrumentedApplication, opts v1.UpdateOptions) (result *v1alpha1.InstrumentedApplication, err error) {
-	emptyResult := &v1alpha1.InstrumentedApplication{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(instrumentedapplicationsResource, c.ns, instrumentedApplication, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentedApplication), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeInstrumentedApplications) UpdateStatus(ctx context.Context, instrumentedApplication *v1alpha1.InstrumentedApplication, opts v1.UpdateOptions) (result *v1alpha1.InstrumentedApplication, err error) {
-	emptyResult := &v1alpha1.InstrumentedApplication{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(instrumentedapplicationsResource, "status", c.ns, instrumentedApplication, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentedApplication), err
-}
-
-// Delete takes name of the instrumentedApplication and deletes it. Returns an error if one occurs.
-func (c *FakeInstrumentedApplications) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(instrumentedapplicationsResource, c.ns, name, opts), &v1alpha1.InstrumentedApplication{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeInstrumentedApplications) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(instrumentedapplicationsResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.InstrumentedApplicationList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched instrumentedApplication.
-func (c *FakeInstrumentedApplications) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentedApplication, err error) {
-	emptyResult := &v1alpha1.InstrumentedApplication{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentedapplicationsResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentedApplication), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied instrumentedApplication.
-func (c *FakeInstrumentedApplications) Apply(ctx context.Context, instrumentedApplication *odigosv1alpha1.InstrumentedApplicationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentedApplication, err error) {
-	if instrumentedApplication == nil {
-		return nil, fmt.Errorf("instrumentedApplication provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentedApplication)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentedApplication.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentedApplication.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentedApplication{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentedapplicationsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.InstrumentedApplication), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeInstrumentedApplications) ApplyStatus(ctx context.Context, instrumentedApplication *odigosv1alpha1.InstrumentedApplicationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentedApplication, err error) {
-	if instrumentedApplication == nil {
-		return nil, fmt.Errorf("instrumentedApplication provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(instrumentedApplication)
-	if err != nil {
-		return nil, err
-	}
-	name := instrumentedApplication.Name
-	if name == nil {
-		return nil, fmt.Errorf("instrumentedApplication.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.InstrumentedApplication{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(instrumentedapplicationsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeInstrumentedApplications(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.InstrumentedApplicationInterface {
+	return &fakeInstrumentedApplications{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.InstrumentedApplication, *v1alpha1.InstrumentedApplicationList, *odigosv1alpha1.InstrumentedApplicationApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("instrumentedapplications"),
+			v1alpha1.SchemeGroupVersion.WithKind("InstrumentedApplication"),
+			func() *v1alpha1.InstrumentedApplication { return &v1alpha1.InstrumentedApplication{} },
+			func() *v1alpha1.InstrumentedApplicationList { return &v1alpha1.InstrumentedApplicationList{} },
+			func(dst, src *v1alpha1.InstrumentedApplicationList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.InstrumentedApplicationList) []*v1alpha1.InstrumentedApplication {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.InstrumentedApplicationList, items []*v1alpha1.InstrumentedApplication) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.InstrumentedApplication), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigos_client.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigos_client.go
index 37a6bb0124..638729153a 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigos_client.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigos_client.go
@@ -28,39 +28,39 @@ type FakeOdigosV1alpha1 struct {
 }
 
 func (c *FakeOdigosV1alpha1) CollectorsGroups(namespace string) v1alpha1.CollectorsGroupInterface {
-	return &FakeCollectorsGroups{c, namespace}
+	return newFakeCollectorsGroups(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) Destinations(namespace string) v1alpha1.DestinationInterface {
-	return &FakeDestinations{c, namespace}
+	return newFakeDestinations(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) InstrumentationConfigs(namespace string) v1alpha1.InstrumentationConfigInterface {
-	return &FakeInstrumentationConfigs{c, namespace}
+	return newFakeInstrumentationConfigs(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) InstrumentationInstances(namespace string) v1alpha1.InstrumentationInstanceInterface {
-	return &FakeInstrumentationInstances{c, namespace}
+	return newFakeInstrumentationInstances(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) InstrumentationRules(namespace string) v1alpha1.InstrumentationRuleInterface {
-	return &FakeInstrumentationRules{c, namespace}
+	return newFakeInstrumentationRules(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) InstrumentedApplications(namespace string) v1alpha1.InstrumentedApplicationInterface {
-	return &FakeInstrumentedApplications{c, namespace}
+	return newFakeInstrumentedApplications(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) OdigosConfigurations(namespace string) v1alpha1.OdigosConfigurationInterface {
-	return &FakeOdigosConfigurations{c, namespace}
+	return newFakeOdigosConfigurations(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) Processors(namespace string) v1alpha1.ProcessorInterface {
-	return &FakeProcessors{c, namespace}
+	return newFakeProcessors(c, namespace)
 }
 
 func (c *FakeOdigosV1alpha1) Sources(namespace string) v1alpha1.SourceInterface {
-	return &FakeSources{c, namespace}
+	return newFakeSources(c, namespace)
 }
 
 // RESTClient returns a RESTClient that is used to communicate
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigosconfiguration.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigosconfiguration.go
index 9029b46060..b45220ccf7 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigosconfiguration.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_odigosconfiguration.go
@@ -18,142 +18,35 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeOdigosConfigurations implements OdigosConfigurationInterface
-type FakeOdigosConfigurations struct {
+// fakeOdigosConfigurations implements OdigosConfigurationInterface
+type fakeOdigosConfigurations struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.OdigosConfiguration, *v1alpha1.OdigosConfigurationList, *odigosv1alpha1.OdigosConfigurationApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var odigosconfigurationsResource = v1alpha1.SchemeGroupVersion.WithResource("odigosconfigurations")
-
-var odigosconfigurationsKind = v1alpha1.SchemeGroupVersion.WithKind("OdigosConfiguration")
-
-// Get takes name of the odigosConfiguration, and returns the corresponding odigosConfiguration object, and an error if there is any.
-func (c *FakeOdigosConfigurations) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.OdigosConfiguration, err error) {
-	emptyResult := &v1alpha1.OdigosConfiguration{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(odigosconfigurationsResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.OdigosConfiguration), err
-}
-
-// List takes label and field selectors, and returns the list of OdigosConfigurations that match those selectors.
-func (c *FakeOdigosConfigurations) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.OdigosConfigurationList, err error) {
-	emptyResult := &v1alpha1.OdigosConfigurationList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(odigosconfigurationsResource, odigosconfigurationsKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.OdigosConfigurationList{ListMeta: obj.(*v1alpha1.OdigosConfigurationList).ListMeta}
-	for _, item := range obj.(*v1alpha1.OdigosConfigurationList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested odigosConfigurations.
-func (c *FakeOdigosConfigurations) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(odigosconfigurationsResource, c.ns, opts))
-
 }
 
-// Create takes the representation of a odigosConfiguration and creates it.  Returns the server's representation of the odigosConfiguration, and an error, if there is any.
-func (c *FakeOdigosConfigurations) Create(ctx context.Context, odigosConfiguration *v1alpha1.OdigosConfiguration, opts v1.CreateOptions) (result *v1alpha1.OdigosConfiguration, err error) {
-	emptyResult := &v1alpha1.OdigosConfiguration{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(odigosconfigurationsResource, c.ns, odigosConfiguration, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.OdigosConfiguration), err
-}
-
-// Update takes the representation of a odigosConfiguration and updates it. Returns the server's representation of the odigosConfiguration, and an error, if there is any.
-func (c *FakeOdigosConfigurations) Update(ctx context.Context, odigosConfiguration *v1alpha1.OdigosConfiguration, opts v1.UpdateOptions) (result *v1alpha1.OdigosConfiguration, err error) {
-	emptyResult := &v1alpha1.OdigosConfiguration{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(odigosconfigurationsResource, c.ns, odigosConfiguration, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.OdigosConfiguration), err
-}
-
-// Delete takes name of the odigosConfiguration and deletes it. Returns an error if one occurs.
-func (c *FakeOdigosConfigurations) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(odigosconfigurationsResource, c.ns, name, opts), &v1alpha1.OdigosConfiguration{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeOdigosConfigurations) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(odigosconfigurationsResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.OdigosConfigurationList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched odigosConfiguration.
-func (c *FakeOdigosConfigurations) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.OdigosConfiguration, err error) {
-	emptyResult := &v1alpha1.OdigosConfiguration{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(odigosconfigurationsResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.OdigosConfiguration), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied odigosConfiguration.
-func (c *FakeOdigosConfigurations) Apply(ctx context.Context, odigosConfiguration *odigosv1alpha1.OdigosConfigurationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.OdigosConfiguration, err error) {
-	if odigosConfiguration == nil {
-		return nil, fmt.Errorf("odigosConfiguration provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(odigosConfiguration)
-	if err != nil {
-		return nil, err
-	}
-	name := odigosConfiguration.Name
-	if name == nil {
-		return nil, fmt.Errorf("odigosConfiguration.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.OdigosConfiguration{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(odigosconfigurationsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeOdigosConfigurations(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.OdigosConfigurationInterface {
+	return &fakeOdigosConfigurations{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.OdigosConfiguration, *v1alpha1.OdigosConfigurationList, *odigosv1alpha1.OdigosConfigurationApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("odigosconfigurations"),
+			v1alpha1.SchemeGroupVersion.WithKind("OdigosConfiguration"),
+			func() *v1alpha1.OdigosConfiguration { return &v1alpha1.OdigosConfiguration{} },
+			func() *v1alpha1.OdigosConfigurationList { return &v1alpha1.OdigosConfigurationList{} },
+			func(dst, src *v1alpha1.OdigosConfigurationList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.OdigosConfigurationList) []*v1alpha1.OdigosConfiguration {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v1alpha1.OdigosConfigurationList, items []*v1alpha1.OdigosConfiguration) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.OdigosConfiguration), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_processor.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_processor.go
index 2370095564..8d0ccb046d 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_processor.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_processor.go
@@ -18,179 +18,33 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeProcessors implements ProcessorInterface
-type FakeProcessors struct {
+// fakeProcessors implements ProcessorInterface
+type fakeProcessors struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.Processor, *v1alpha1.ProcessorList, *odigosv1alpha1.ProcessorApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var processorsResource = v1alpha1.SchemeGroupVersion.WithResource("processors")
-
-var processorsKind = v1alpha1.SchemeGroupVersion.WithKind("Processor")
-
-// Get takes name of the processor, and returns the corresponding processor object, and an error if there is any.
-func (c *FakeProcessors) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Processor, err error) {
-	emptyResult := &v1alpha1.Processor{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(processorsResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Processor), err
-}
-
-// List takes label and field selectors, and returns the list of Processors that match those selectors.
-func (c *FakeProcessors) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ProcessorList, err error) {
-	emptyResult := &v1alpha1.ProcessorList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(processorsResource, processorsKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.ProcessorList{ListMeta: obj.(*v1alpha1.ProcessorList).ListMeta}
-	for _, item := range obj.(*v1alpha1.ProcessorList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested processors.
-func (c *FakeProcessors) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(processorsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a processor and creates it.  Returns the server's representation of the processor, and an error, if there is any.
-func (c *FakeProcessors) Create(ctx context.Context, processor *v1alpha1.Processor, opts v1.CreateOptions) (result *v1alpha1.Processor, err error) {
-	emptyResult := &v1alpha1.Processor{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(processorsResource, c.ns, processor, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Processor), err
-}
-
-// Update takes the representation of a processor and updates it. Returns the server's representation of the processor, and an error, if there is any.
-func (c *FakeProcessors) Update(ctx context.Context, processor *v1alpha1.Processor, opts v1.UpdateOptions) (result *v1alpha1.Processor, err error) {
-	emptyResult := &v1alpha1.Processor{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(processorsResource, c.ns, processor, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Processor), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeProcessors) UpdateStatus(ctx context.Context, processor *v1alpha1.Processor, opts v1.UpdateOptions) (result *v1alpha1.Processor, err error) {
-	emptyResult := &v1alpha1.Processor{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(processorsResource, "status", c.ns, processor, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Processor), err
-}
-
-// Delete takes name of the processor and deletes it. Returns an error if one occurs.
-func (c *FakeProcessors) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(processorsResource, c.ns, name, opts), &v1alpha1.Processor{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeProcessors) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(processorsResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.ProcessorList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched processor.
-func (c *FakeProcessors) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Processor, err error) {
-	emptyResult := &v1alpha1.Processor{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(processorsResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Processor), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied processor.
-func (c *FakeProcessors) Apply(ctx context.Context, processor *odigosv1alpha1.ProcessorApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Processor, err error) {
-	if processor == nil {
-		return nil, fmt.Errorf("processor provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(processor)
-	if err != nil {
-		return nil, err
-	}
-	name := processor.Name
-	if name == nil {
-		return nil, fmt.Errorf("processor.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.Processor{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(processorsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Processor), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeProcessors) ApplyStatus(ctx context.Context, processor *odigosv1alpha1.ProcessorApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Processor, err error) {
-	if processor == nil {
-		return nil, fmt.Errorf("processor provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(processor)
-	if err != nil {
-		return nil, err
-	}
-	name := processor.Name
-	if name == nil {
-		return nil, fmt.Errorf("processor.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.Processor{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(processorsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeProcessors(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.ProcessorInterface {
+	return &fakeProcessors{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.Processor, *v1alpha1.ProcessorList, *odigosv1alpha1.ProcessorApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("processors"),
+			v1alpha1.SchemeGroupVersion.WithKind("Processor"),
+			func() *v1alpha1.Processor { return &v1alpha1.Processor{} },
+			func() *v1alpha1.ProcessorList { return &v1alpha1.ProcessorList{} },
+			func(dst, src *v1alpha1.ProcessorList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.ProcessorList) []*v1alpha1.Processor { return gentype.ToPointerSlice(list.Items) },
+			func(list *v1alpha1.ProcessorList, items []*v1alpha1.Processor) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.Processor), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_source.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_source.go
index 58451ba260..ceecea5676 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_source.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/fake/fake_source.go
@@ -18,179 +18,33 @@ limitations under the License.
 package fake
 
 import (
-	"context"
-	json "encoding/json"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	typedodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1"
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
+	gentype "k8s.io/client-go/gentype"
 )
 
-// FakeSources implements SourceInterface
-type FakeSources struct {
+// fakeSources implements SourceInterface
+type fakeSources struct {
+	*gentype.FakeClientWithListAndApply[*v1alpha1.Source, *v1alpha1.SourceList, *odigosv1alpha1.SourceApplyConfiguration]
 	Fake *FakeOdigosV1alpha1
-	ns   string
-}
-
-var sourcesResource = v1alpha1.SchemeGroupVersion.WithResource("sources")
-
-var sourcesKind = v1alpha1.SchemeGroupVersion.WithKind("Source")
-
-// Get takes name of the source, and returns the corresponding source object, and an error if there is any.
-func (c *FakeSources) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Source, err error) {
-	emptyResult := &v1alpha1.Source{}
-	obj, err := c.Fake.
-		Invokes(testing.NewGetActionWithOptions(sourcesResource, c.ns, name, options), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Source), err
-}
-
-// List takes label and field selectors, and returns the list of Sources that match those selectors.
-func (c *FakeSources) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.SourceList, err error) {
-	emptyResult := &v1alpha1.SourceList{}
-	obj, err := c.Fake.
-		Invokes(testing.NewListActionWithOptions(sourcesResource, sourcesKind, c.ns, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.SourceList{ListMeta: obj.(*v1alpha1.SourceList).ListMeta}
-	for _, item := range obj.(*v1alpha1.SourceList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested sources.
-func (c *FakeSources) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchActionWithOptions(sourcesResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a source and creates it.  Returns the server's representation of the source, and an error, if there is any.
-func (c *FakeSources) Create(ctx context.Context, source *v1alpha1.Source, opts v1.CreateOptions) (result *v1alpha1.Source, err error) {
-	emptyResult := &v1alpha1.Source{}
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateActionWithOptions(sourcesResource, c.ns, source, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Source), err
-}
-
-// Update takes the representation of a source and updates it. Returns the server's representation of the source, and an error, if there is any.
-func (c *FakeSources) Update(ctx context.Context, source *v1alpha1.Source, opts v1.UpdateOptions) (result *v1alpha1.Source, err error) {
-	emptyResult := &v1alpha1.Source{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateActionWithOptions(sourcesResource, c.ns, source, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Source), err
 }
 
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeSources) UpdateStatus(ctx context.Context, source *v1alpha1.Source, opts v1.UpdateOptions) (result *v1alpha1.Source, err error) {
-	emptyResult := &v1alpha1.Source{}
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceActionWithOptions(sourcesResource, "status", c.ns, source, opts), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Source), err
-}
-
-// Delete takes name of the source and deletes it. Returns an error if one occurs.
-func (c *FakeSources) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteActionWithOptions(sourcesResource, c.ns, name, opts), &v1alpha1.Source{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeSources) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
-	action := testing.NewDeleteCollectionActionWithOptions(sourcesResource, c.ns, opts, listOpts)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.SourceList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched source.
-func (c *FakeSources) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Source, err error) {
-	emptyResult := &v1alpha1.Source{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(sourcesResource, c.ns, name, pt, data, opts, subresources...), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Source), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied source.
-func (c *FakeSources) Apply(ctx context.Context, source *odigosv1alpha1.SourceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Source, err error) {
-	if source == nil {
-		return nil, fmt.Errorf("source provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(source)
-	if err != nil {
-		return nil, err
-	}
-	name := source.Name
-	if name == nil {
-		return nil, fmt.Errorf("source.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.Source{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(sourcesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
-	}
-	return obj.(*v1alpha1.Source), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeSources) ApplyStatus(ctx context.Context, source *odigosv1alpha1.SourceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Source, err error) {
-	if source == nil {
-		return nil, fmt.Errorf("source provided to Apply must not be nil")
-	}
-	data, err := json.Marshal(source)
-	if err != nil {
-		return nil, err
-	}
-	name := source.Name
-	if name == nil {
-		return nil, fmt.Errorf("source.Name must be provided to Apply")
-	}
-	emptyResult := &v1alpha1.Source{}
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceActionWithOptions(sourcesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult)
-
-	if obj == nil {
-		return emptyResult, err
+func newFakeSources(fake *FakeOdigosV1alpha1, namespace string) typedodigosv1alpha1.SourceInterface {
+	return &fakeSources{
+		gentype.NewFakeClientWithListAndApply[*v1alpha1.Source, *v1alpha1.SourceList, *odigosv1alpha1.SourceApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v1alpha1.SchemeGroupVersion.WithResource("sources"),
+			v1alpha1.SchemeGroupVersion.WithKind("Source"),
+			func() *v1alpha1.Source { return &v1alpha1.Source{} },
+			func() *v1alpha1.SourceList { return &v1alpha1.SourceList{} },
+			func(dst, src *v1alpha1.SourceList) { dst.ListMeta = src.ListMeta },
+			func(list *v1alpha1.SourceList) []*v1alpha1.Source { return gentype.ToPointerSlice(list.Items) },
+			func(list *v1alpha1.SourceList, items []*v1alpha1.Source) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
 	}
-	return obj.(*v1alpha1.Source), err
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationconfig.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationconfig.go
index ac34486fc7..343b405086 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationconfig.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationconfig.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,37 @@ type InstrumentationConfigsGetter interface {
 
 // InstrumentationConfigInterface has methods to work with InstrumentationConfig resources.
 type InstrumentationConfigInterface interface {
-	Create(ctx context.Context, instrumentationConfig *v1alpha1.InstrumentationConfig, opts v1.CreateOptions) (*v1alpha1.InstrumentationConfig, error)
-	Update(ctx context.Context, instrumentationConfig *v1alpha1.InstrumentationConfig, opts v1.UpdateOptions) (*v1alpha1.InstrumentationConfig, error)
+	Create(ctx context.Context, instrumentationConfig *odigosv1alpha1.InstrumentationConfig, opts v1.CreateOptions) (*odigosv1alpha1.InstrumentationConfig, error)
+	Update(ctx context.Context, instrumentationConfig *odigosv1alpha1.InstrumentationConfig, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentationConfig, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, instrumentationConfig *v1alpha1.InstrumentationConfig, opts v1.UpdateOptions) (*v1alpha1.InstrumentationConfig, error)
+	UpdateStatus(ctx context.Context, instrumentationConfig *odigosv1alpha1.InstrumentationConfig, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentationConfig, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.InstrumentationConfig, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.InstrumentationConfigList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.InstrumentationConfig, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.InstrumentationConfigList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentationConfig, err error)
-	Apply(ctx context.Context, instrumentationConfig *odigosv1alpha1.InstrumentationConfigApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationConfig, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.InstrumentationConfig, err error)
+	Apply(ctx context.Context, instrumentationConfig *applyconfigurationodigosv1alpha1.InstrumentationConfigApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentationConfig, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, instrumentationConfig *odigosv1alpha1.InstrumentationConfigApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationConfig, err error)
+	ApplyStatus(ctx context.Context, instrumentationConfig *applyconfigurationodigosv1alpha1.InstrumentationConfigApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentationConfig, err error)
 	InstrumentationConfigExpansion
 }
 
 // instrumentationConfigs implements InstrumentationConfigInterface
 type instrumentationConfigs struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.InstrumentationConfig, *v1alpha1.InstrumentationConfigList, *odigosv1alpha1.InstrumentationConfigApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.InstrumentationConfig, *odigosv1alpha1.InstrumentationConfigList, *applyconfigurationodigosv1alpha1.InstrumentationConfigApplyConfiguration]
 }
 
 // newInstrumentationConfigs returns a InstrumentationConfigs
 func newInstrumentationConfigs(c *OdigosV1alpha1Client, namespace string) *instrumentationConfigs {
 	return &instrumentationConfigs{
-		gentype.NewClientWithListAndApply[*v1alpha1.InstrumentationConfig, *v1alpha1.InstrumentationConfigList, *odigosv1alpha1.InstrumentationConfigApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.InstrumentationConfig, *odigosv1alpha1.InstrumentationConfigList, *applyconfigurationodigosv1alpha1.InstrumentationConfigApplyConfiguration](
 			"instrumentationconfigs",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.InstrumentationConfig { return &v1alpha1.InstrumentationConfig{} },
-			func() *v1alpha1.InstrumentationConfigList { return &v1alpha1.InstrumentationConfigList{} }),
+			func() *odigosv1alpha1.InstrumentationConfig { return &odigosv1alpha1.InstrumentationConfig{} },
+			func() *odigosv1alpha1.InstrumentationConfigList { return &odigosv1alpha1.InstrumentationConfigList{} },
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationinstance.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationinstance.go
index 435515e0f4..7e40301181 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationinstance.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationinstance.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,39 @@ type InstrumentationInstancesGetter interface {
 
 // InstrumentationInstanceInterface has methods to work with InstrumentationInstance resources.
 type InstrumentationInstanceInterface interface {
-	Create(ctx context.Context, instrumentationInstance *v1alpha1.InstrumentationInstance, opts v1.CreateOptions) (*v1alpha1.InstrumentationInstance, error)
-	Update(ctx context.Context, instrumentationInstance *v1alpha1.InstrumentationInstance, opts v1.UpdateOptions) (*v1alpha1.InstrumentationInstance, error)
+	Create(ctx context.Context, instrumentationInstance *odigosv1alpha1.InstrumentationInstance, opts v1.CreateOptions) (*odigosv1alpha1.InstrumentationInstance, error)
+	Update(ctx context.Context, instrumentationInstance *odigosv1alpha1.InstrumentationInstance, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentationInstance, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, instrumentationInstance *v1alpha1.InstrumentationInstance, opts v1.UpdateOptions) (*v1alpha1.InstrumentationInstance, error)
+	UpdateStatus(ctx context.Context, instrumentationInstance *odigosv1alpha1.InstrumentationInstance, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentationInstance, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.InstrumentationInstance, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.InstrumentationInstanceList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.InstrumentationInstance, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.InstrumentationInstanceList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentationInstance, err error)
-	Apply(ctx context.Context, instrumentationInstance *odigosv1alpha1.InstrumentationInstanceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationInstance, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.InstrumentationInstance, err error)
+	Apply(ctx context.Context, instrumentationInstance *applyconfigurationodigosv1alpha1.InstrumentationInstanceApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentationInstance, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, instrumentationInstance *odigosv1alpha1.InstrumentationInstanceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationInstance, err error)
+	ApplyStatus(ctx context.Context, instrumentationInstance *applyconfigurationodigosv1alpha1.InstrumentationInstanceApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentationInstance, err error)
 	InstrumentationInstanceExpansion
 }
 
 // instrumentationInstances implements InstrumentationInstanceInterface
 type instrumentationInstances struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.InstrumentationInstance, *v1alpha1.InstrumentationInstanceList, *odigosv1alpha1.InstrumentationInstanceApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.InstrumentationInstance, *odigosv1alpha1.InstrumentationInstanceList, *applyconfigurationodigosv1alpha1.InstrumentationInstanceApplyConfiguration]
 }
 
 // newInstrumentationInstances returns a InstrumentationInstances
 func newInstrumentationInstances(c *OdigosV1alpha1Client, namespace string) *instrumentationInstances {
 	return &instrumentationInstances{
-		gentype.NewClientWithListAndApply[*v1alpha1.InstrumentationInstance, *v1alpha1.InstrumentationInstanceList, *odigosv1alpha1.InstrumentationInstanceApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.InstrumentationInstance, *odigosv1alpha1.InstrumentationInstanceList, *applyconfigurationodigosv1alpha1.InstrumentationInstanceApplyConfiguration](
 			"instrumentationinstances",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.InstrumentationInstance { return &v1alpha1.InstrumentationInstance{} },
-			func() *v1alpha1.InstrumentationInstanceList { return &v1alpha1.InstrumentationInstanceList{} }),
+			func() *odigosv1alpha1.InstrumentationInstance { return &odigosv1alpha1.InstrumentationInstance{} },
+			func() *odigosv1alpha1.InstrumentationInstanceList {
+				return &odigosv1alpha1.InstrumentationInstanceList{}
+			},
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationrule.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationrule.go
index 0f6931135e..71b8443d00 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationrule.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentationrule.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,37 @@ type InstrumentationRulesGetter interface {
 
 // InstrumentationRuleInterface has methods to work with InstrumentationRule resources.
 type InstrumentationRuleInterface interface {
-	Create(ctx context.Context, instrumentationRule *v1alpha1.InstrumentationRule, opts v1.CreateOptions) (*v1alpha1.InstrumentationRule, error)
-	Update(ctx context.Context, instrumentationRule *v1alpha1.InstrumentationRule, opts v1.UpdateOptions) (*v1alpha1.InstrumentationRule, error)
+	Create(ctx context.Context, instrumentationRule *odigosv1alpha1.InstrumentationRule, opts v1.CreateOptions) (*odigosv1alpha1.InstrumentationRule, error)
+	Update(ctx context.Context, instrumentationRule *odigosv1alpha1.InstrumentationRule, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentationRule, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, instrumentationRule *v1alpha1.InstrumentationRule, opts v1.UpdateOptions) (*v1alpha1.InstrumentationRule, error)
+	UpdateStatus(ctx context.Context, instrumentationRule *odigosv1alpha1.InstrumentationRule, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentationRule, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.InstrumentationRule, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.InstrumentationRuleList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.InstrumentationRule, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.InstrumentationRuleList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentationRule, err error)
-	Apply(ctx context.Context, instrumentationRule *odigosv1alpha1.InstrumentationRuleApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationRule, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.InstrumentationRule, err error)
+	Apply(ctx context.Context, instrumentationRule *applyconfigurationodigosv1alpha1.InstrumentationRuleApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentationRule, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, instrumentationRule *odigosv1alpha1.InstrumentationRuleApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentationRule, err error)
+	ApplyStatus(ctx context.Context, instrumentationRule *applyconfigurationodigosv1alpha1.InstrumentationRuleApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentationRule, err error)
 	InstrumentationRuleExpansion
 }
 
 // instrumentationRules implements InstrumentationRuleInterface
 type instrumentationRules struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.InstrumentationRule, *v1alpha1.InstrumentationRuleList, *odigosv1alpha1.InstrumentationRuleApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.InstrumentationRule, *odigosv1alpha1.InstrumentationRuleList, *applyconfigurationodigosv1alpha1.InstrumentationRuleApplyConfiguration]
 }
 
 // newInstrumentationRules returns a InstrumentationRules
 func newInstrumentationRules(c *OdigosV1alpha1Client, namespace string) *instrumentationRules {
 	return &instrumentationRules{
-		gentype.NewClientWithListAndApply[*v1alpha1.InstrumentationRule, *v1alpha1.InstrumentationRuleList, *odigosv1alpha1.InstrumentationRuleApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.InstrumentationRule, *odigosv1alpha1.InstrumentationRuleList, *applyconfigurationodigosv1alpha1.InstrumentationRuleApplyConfiguration](
 			"instrumentationrules",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.InstrumentationRule { return &v1alpha1.InstrumentationRule{} },
-			func() *v1alpha1.InstrumentationRuleList { return &v1alpha1.InstrumentationRuleList{} }),
+			func() *odigosv1alpha1.InstrumentationRule { return &odigosv1alpha1.InstrumentationRule{} },
+			func() *odigosv1alpha1.InstrumentationRuleList { return &odigosv1alpha1.InstrumentationRuleList{} },
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentedapplication.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentedapplication.go
index faa5e8457e..e00ca0e375 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentedapplication.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/instrumentedapplication.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,39 @@ type InstrumentedApplicationsGetter interface {
 
 // InstrumentedApplicationInterface has methods to work with InstrumentedApplication resources.
 type InstrumentedApplicationInterface interface {
-	Create(ctx context.Context, instrumentedApplication *v1alpha1.InstrumentedApplication, opts v1.CreateOptions) (*v1alpha1.InstrumentedApplication, error)
-	Update(ctx context.Context, instrumentedApplication *v1alpha1.InstrumentedApplication, opts v1.UpdateOptions) (*v1alpha1.InstrumentedApplication, error)
+	Create(ctx context.Context, instrumentedApplication *odigosv1alpha1.InstrumentedApplication, opts v1.CreateOptions) (*odigosv1alpha1.InstrumentedApplication, error)
+	Update(ctx context.Context, instrumentedApplication *odigosv1alpha1.InstrumentedApplication, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentedApplication, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, instrumentedApplication *v1alpha1.InstrumentedApplication, opts v1.UpdateOptions) (*v1alpha1.InstrumentedApplication, error)
+	UpdateStatus(ctx context.Context, instrumentedApplication *odigosv1alpha1.InstrumentedApplication, opts v1.UpdateOptions) (*odigosv1alpha1.InstrumentedApplication, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.InstrumentedApplication, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.InstrumentedApplicationList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.InstrumentedApplication, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.InstrumentedApplicationList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.InstrumentedApplication, err error)
-	Apply(ctx context.Context, instrumentedApplication *odigosv1alpha1.InstrumentedApplicationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentedApplication, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.InstrumentedApplication, err error)
+	Apply(ctx context.Context, instrumentedApplication *applyconfigurationodigosv1alpha1.InstrumentedApplicationApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentedApplication, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, instrumentedApplication *odigosv1alpha1.InstrumentedApplicationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.InstrumentedApplication, err error)
+	ApplyStatus(ctx context.Context, instrumentedApplication *applyconfigurationodigosv1alpha1.InstrumentedApplicationApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.InstrumentedApplication, err error)
 	InstrumentedApplicationExpansion
 }
 
 // instrumentedApplications implements InstrumentedApplicationInterface
 type instrumentedApplications struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.InstrumentedApplication, *v1alpha1.InstrumentedApplicationList, *odigosv1alpha1.InstrumentedApplicationApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.InstrumentedApplication, *odigosv1alpha1.InstrumentedApplicationList, *applyconfigurationodigosv1alpha1.InstrumentedApplicationApplyConfiguration]
 }
 
 // newInstrumentedApplications returns a InstrumentedApplications
 func newInstrumentedApplications(c *OdigosV1alpha1Client, namespace string) *instrumentedApplications {
 	return &instrumentedApplications{
-		gentype.NewClientWithListAndApply[*v1alpha1.InstrumentedApplication, *v1alpha1.InstrumentedApplicationList, *odigosv1alpha1.InstrumentedApplicationApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.InstrumentedApplication, *odigosv1alpha1.InstrumentedApplicationList, *applyconfigurationodigosv1alpha1.InstrumentedApplicationApplyConfiguration](
 			"instrumentedapplications",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.InstrumentedApplication { return &v1alpha1.InstrumentedApplication{} },
-			func() *v1alpha1.InstrumentedApplicationList { return &v1alpha1.InstrumentedApplicationList{} }),
+			func() *odigosv1alpha1.InstrumentedApplication { return &odigosv1alpha1.InstrumentedApplication{} },
+			func() *odigosv1alpha1.InstrumentedApplicationList {
+				return &odigosv1alpha1.InstrumentedApplicationList{}
+			},
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigos_client.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigos_client.go
index 6e7b3013cf..ec3f277a3b 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigos_client.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigos_client.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"net/http"
+	http "net/http"
 
-	"github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	rest "k8s.io/client-go/rest"
 )
 
@@ -124,10 +124,10 @@ func New(c rest.Interface) *OdigosV1alpha1Client {
 }
 
 func setConfigDefaults(config *rest.Config) error {
-	gv := v1alpha1.SchemeGroupVersion
+	gv := odigosv1alpha1.SchemeGroupVersion
 	config.GroupVersion = &gv
 	config.APIPath = "/apis"
-	config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
+	config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion()
 
 	if config.UserAgent == "" {
 		config.UserAgent = rest.DefaultKubernetesUserAgent()
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigosconfiguration.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigosconfiguration.go
index 5ad282f04c..7e26d0ff33 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigosconfiguration.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/odigosconfiguration.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,32 +37,33 @@ type OdigosConfigurationsGetter interface {
 
 // OdigosConfigurationInterface has methods to work with OdigosConfiguration resources.
 type OdigosConfigurationInterface interface {
-	Create(ctx context.Context, odigosConfiguration *v1alpha1.OdigosConfiguration, opts v1.CreateOptions) (*v1alpha1.OdigosConfiguration, error)
-	Update(ctx context.Context, odigosConfiguration *v1alpha1.OdigosConfiguration, opts v1.UpdateOptions) (*v1alpha1.OdigosConfiguration, error)
+	Create(ctx context.Context, odigosConfiguration *odigosv1alpha1.OdigosConfiguration, opts v1.CreateOptions) (*odigosv1alpha1.OdigosConfiguration, error)
+	Update(ctx context.Context, odigosConfiguration *odigosv1alpha1.OdigosConfiguration, opts v1.UpdateOptions) (*odigosv1alpha1.OdigosConfiguration, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.OdigosConfiguration, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.OdigosConfigurationList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.OdigosConfiguration, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.OdigosConfigurationList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.OdigosConfiguration, err error)
-	Apply(ctx context.Context, odigosConfiguration *odigosv1alpha1.OdigosConfigurationApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.OdigosConfiguration, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.OdigosConfiguration, err error)
+	Apply(ctx context.Context, odigosConfiguration *applyconfigurationodigosv1alpha1.OdigosConfigurationApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.OdigosConfiguration, err error)
 	OdigosConfigurationExpansion
 }
 
 // odigosConfigurations implements OdigosConfigurationInterface
 type odigosConfigurations struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.OdigosConfiguration, *v1alpha1.OdigosConfigurationList, *odigosv1alpha1.OdigosConfigurationApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.OdigosConfiguration, *odigosv1alpha1.OdigosConfigurationList, *applyconfigurationodigosv1alpha1.OdigosConfigurationApplyConfiguration]
 }
 
 // newOdigosConfigurations returns a OdigosConfigurations
 func newOdigosConfigurations(c *OdigosV1alpha1Client, namespace string) *odigosConfigurations {
 	return &odigosConfigurations{
-		gentype.NewClientWithListAndApply[*v1alpha1.OdigosConfiguration, *v1alpha1.OdigosConfigurationList, *odigosv1alpha1.OdigosConfigurationApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.OdigosConfiguration, *odigosv1alpha1.OdigosConfigurationList, *applyconfigurationodigosv1alpha1.OdigosConfigurationApplyConfiguration](
 			"odigosconfigurations",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.OdigosConfiguration { return &v1alpha1.OdigosConfiguration{} },
-			func() *v1alpha1.OdigosConfigurationList { return &v1alpha1.OdigosConfigurationList{} }),
+			func() *odigosv1alpha1.OdigosConfiguration { return &odigosv1alpha1.OdigosConfiguration{} },
+			func() *odigosv1alpha1.OdigosConfigurationList { return &odigosv1alpha1.OdigosConfigurationList{} },
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/processor.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/processor.go
index 99e2dacc18..a076e9818b 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/processor.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/processor.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,37 @@ type ProcessorsGetter interface {
 
 // ProcessorInterface has methods to work with Processor resources.
 type ProcessorInterface interface {
-	Create(ctx context.Context, processor *v1alpha1.Processor, opts v1.CreateOptions) (*v1alpha1.Processor, error)
-	Update(ctx context.Context, processor *v1alpha1.Processor, opts v1.UpdateOptions) (*v1alpha1.Processor, error)
+	Create(ctx context.Context, processor *odigosv1alpha1.Processor, opts v1.CreateOptions) (*odigosv1alpha1.Processor, error)
+	Update(ctx context.Context, processor *odigosv1alpha1.Processor, opts v1.UpdateOptions) (*odigosv1alpha1.Processor, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, processor *v1alpha1.Processor, opts v1.UpdateOptions) (*v1alpha1.Processor, error)
+	UpdateStatus(ctx context.Context, processor *odigosv1alpha1.Processor, opts v1.UpdateOptions) (*odigosv1alpha1.Processor, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Processor, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.ProcessorList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.Processor, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.ProcessorList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Processor, err error)
-	Apply(ctx context.Context, processor *odigosv1alpha1.ProcessorApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Processor, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.Processor, err error)
+	Apply(ctx context.Context, processor *applyconfigurationodigosv1alpha1.ProcessorApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.Processor, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, processor *odigosv1alpha1.ProcessorApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Processor, err error)
+	ApplyStatus(ctx context.Context, processor *applyconfigurationodigosv1alpha1.ProcessorApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.Processor, err error)
 	ProcessorExpansion
 }
 
 // processors implements ProcessorInterface
 type processors struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.Processor, *v1alpha1.ProcessorList, *odigosv1alpha1.ProcessorApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.Processor, *odigosv1alpha1.ProcessorList, *applyconfigurationodigosv1alpha1.ProcessorApplyConfiguration]
 }
 
 // newProcessors returns a Processors
 func newProcessors(c *OdigosV1alpha1Client, namespace string) *processors {
 	return &processors{
-		gentype.NewClientWithListAndApply[*v1alpha1.Processor, *v1alpha1.ProcessorList, *odigosv1alpha1.ProcessorApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.Processor, *odigosv1alpha1.ProcessorList, *applyconfigurationodigosv1alpha1.ProcessorApplyConfiguration](
 			"processors",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.Processor { return &v1alpha1.Processor{} },
-			func() *v1alpha1.ProcessorList { return &v1alpha1.ProcessorList{} }),
+			func() *odigosv1alpha1.Processor { return &odigosv1alpha1.Processor{} },
+			func() *odigosv1alpha1.ProcessorList { return &odigosv1alpha1.ProcessorList{} },
+		),
 	}
 }
diff --git a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/source.go b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/source.go
index 3245a184ee..5173c850e4 100644
--- a/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/source.go
+++ b/api/generated/odigos/clientset/versioned/typed/odigos/v1alpha1/source.go
@@ -18,11 +18,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
+	applyconfigurationodigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/applyconfiguration/odigos/v1alpha1"
 	scheme "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned/scheme"
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -37,36 +37,37 @@ type SourcesGetter interface {
 
 // SourceInterface has methods to work with Source resources.
 type SourceInterface interface {
-	Create(ctx context.Context, source *v1alpha1.Source, opts v1.CreateOptions) (*v1alpha1.Source, error)
-	Update(ctx context.Context, source *v1alpha1.Source, opts v1.UpdateOptions) (*v1alpha1.Source, error)
+	Create(ctx context.Context, source *odigosv1alpha1.Source, opts v1.CreateOptions) (*odigosv1alpha1.Source, error)
+	Update(ctx context.Context, source *odigosv1alpha1.Source, opts v1.UpdateOptions) (*odigosv1alpha1.Source, error)
 	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-	UpdateStatus(ctx context.Context, source *v1alpha1.Source, opts v1.UpdateOptions) (*v1alpha1.Source, error)
+	UpdateStatus(ctx context.Context, source *odigosv1alpha1.Source, opts v1.UpdateOptions) (*odigosv1alpha1.Source, error)
 	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
-	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Source, error)
-	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.SourceList, error)
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*odigosv1alpha1.Source, error)
+	List(ctx context.Context, opts v1.ListOptions) (*odigosv1alpha1.SourceList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
-	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Source, err error)
-	Apply(ctx context.Context, source *odigosv1alpha1.SourceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Source, err error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *odigosv1alpha1.Source, err error)
+	Apply(ctx context.Context, source *applyconfigurationodigosv1alpha1.SourceApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.Source, err error)
 	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-	ApplyStatus(ctx context.Context, source *odigosv1alpha1.SourceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Source, err error)
+	ApplyStatus(ctx context.Context, source *applyconfigurationodigosv1alpha1.SourceApplyConfiguration, opts v1.ApplyOptions) (result *odigosv1alpha1.Source, err error)
 	SourceExpansion
 }
 
 // sources implements SourceInterface
 type sources struct {
-	*gentype.ClientWithListAndApply[*v1alpha1.Source, *v1alpha1.SourceList, *odigosv1alpha1.SourceApplyConfiguration]
+	*gentype.ClientWithListAndApply[*odigosv1alpha1.Source, *odigosv1alpha1.SourceList, *applyconfigurationodigosv1alpha1.SourceApplyConfiguration]
 }
 
 // newSources returns a Sources
 func newSources(c *OdigosV1alpha1Client, namespace string) *sources {
 	return &sources{
-		gentype.NewClientWithListAndApply[*v1alpha1.Source, *v1alpha1.SourceList, *odigosv1alpha1.SourceApplyConfiguration](
+		gentype.NewClientWithListAndApply[*odigosv1alpha1.Source, *odigosv1alpha1.SourceList, *applyconfigurationodigosv1alpha1.SourceApplyConfiguration](
 			"sources",
 			c.RESTClient(),
 			scheme.ParameterCodec,
 			namespace,
-			func() *v1alpha1.Source { return &v1alpha1.Source{} },
-			func() *v1alpha1.SourceList { return &v1alpha1.SourceList{} }),
+			func() *odigosv1alpha1.Source { return &odigosv1alpha1.Source{} },
+			func() *odigosv1alpha1.SourceList { return &odigosv1alpha1.SourceList{} },
+		),
 	}
 }
diff --git a/api/generated/odigos/informers/externalversions/generic.go b/api/generated/odigos/informers/externalversions/generic.go
index 0ce00ff048..8f55d28e56 100644
--- a/api/generated/odigos/informers/externalversions/generic.go
+++ b/api/generated/odigos/informers/externalversions/generic.go
@@ -18,7 +18,7 @@ limitations under the License.
 package externalversions
 
 import (
-	"fmt"
+	fmt "fmt"
 
 	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/collectorsgroup.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/collectorsgroup.go
index 1db7d1700b..9153e583ce 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/collectorsgroup.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/collectorsgroup.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // CollectorsGroups.
 type CollectorsGroupInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.CollectorsGroupLister
+	Lister() odigosv1alpha1.CollectorsGroupLister
 }
 
 type collectorsGroupInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredCollectorsGroupInformer(client versioned.Interface, namespace st
 				return client.OdigosV1alpha1().CollectorsGroups(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.CollectorsGroup{},
+		&apiodigosv1alpha1.CollectorsGroup{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *collectorsGroupInformer) defaultInformer(client versioned.Interface, re
 }
 
 func (f *collectorsGroupInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.CollectorsGroup{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.CollectorsGroup{}, f.defaultInformer)
 }
 
-func (f *collectorsGroupInformer) Lister() v1alpha1.CollectorsGroupLister {
-	return v1alpha1.NewCollectorsGroupLister(f.Informer().GetIndexer())
+func (f *collectorsGroupInformer) Lister() odigosv1alpha1.CollectorsGroupLister {
+	return odigosv1alpha1.NewCollectorsGroupLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/destination.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/destination.go
index 7b8bb49f98..e0de2b982b 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/destination.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/destination.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // Destinations.
 type DestinationInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.DestinationLister
+	Lister() odigosv1alpha1.DestinationLister
 }
 
 type destinationInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredDestinationInformer(client versioned.Interface, namespace string
 				return client.OdigosV1alpha1().Destinations(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.Destination{},
+		&apiodigosv1alpha1.Destination{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *destinationInformer) defaultInformer(client versioned.Interface, resync
 }
 
 func (f *destinationInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.Destination{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.Destination{}, f.defaultInformer)
 }
 
-func (f *destinationInformer) Lister() v1alpha1.DestinationLister {
-	return v1alpha1.NewDestinationLister(f.Informer().GetIndexer())
+func (f *destinationInformer) Lister() odigosv1alpha1.DestinationLister {
+	return odigosv1alpha1.NewDestinationLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationconfig.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationconfig.go
index f72de8cd7d..256934015e 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationconfig.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationconfig.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // InstrumentationConfigs.
 type InstrumentationConfigInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.InstrumentationConfigLister
+	Lister() odigosv1alpha1.InstrumentationConfigLister
 }
 
 type instrumentationConfigInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredInstrumentationConfigInformer(client versioned.Interface, namesp
 				return client.OdigosV1alpha1().InstrumentationConfigs(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.InstrumentationConfig{},
+		&apiodigosv1alpha1.InstrumentationConfig{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *instrumentationConfigInformer) defaultInformer(client versioned.Interfa
 }
 
 func (f *instrumentationConfigInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.InstrumentationConfig{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.InstrumentationConfig{}, f.defaultInformer)
 }
 
-func (f *instrumentationConfigInformer) Lister() v1alpha1.InstrumentationConfigLister {
-	return v1alpha1.NewInstrumentationConfigLister(f.Informer().GetIndexer())
+func (f *instrumentationConfigInformer) Lister() odigosv1alpha1.InstrumentationConfigLister {
+	return odigosv1alpha1.NewInstrumentationConfigLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationinstance.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationinstance.go
index 33d3b0f5a4..5501786b82 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationinstance.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationinstance.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // InstrumentationInstances.
 type InstrumentationInstanceInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.InstrumentationInstanceLister
+	Lister() odigosv1alpha1.InstrumentationInstanceLister
 }
 
 type instrumentationInstanceInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredInstrumentationInstanceInformer(client versioned.Interface, name
 				return client.OdigosV1alpha1().InstrumentationInstances(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.InstrumentationInstance{},
+		&apiodigosv1alpha1.InstrumentationInstance{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *instrumentationInstanceInformer) defaultInformer(client versioned.Inter
 }
 
 func (f *instrumentationInstanceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.InstrumentationInstance{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.InstrumentationInstance{}, f.defaultInformer)
 }
 
-func (f *instrumentationInstanceInformer) Lister() v1alpha1.InstrumentationInstanceLister {
-	return v1alpha1.NewInstrumentationInstanceLister(f.Informer().GetIndexer())
+func (f *instrumentationInstanceInformer) Lister() odigosv1alpha1.InstrumentationInstanceLister {
+	return odigosv1alpha1.NewInstrumentationInstanceLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationrule.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationrule.go
index 0df370208e..e748eca606 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationrule.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentationrule.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // InstrumentationRules.
 type InstrumentationRuleInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.InstrumentationRuleLister
+	Lister() odigosv1alpha1.InstrumentationRuleLister
 }
 
 type instrumentationRuleInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredInstrumentationRuleInformer(client versioned.Interface, namespac
 				return client.OdigosV1alpha1().InstrumentationRules(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.InstrumentationRule{},
+		&apiodigosv1alpha1.InstrumentationRule{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *instrumentationRuleInformer) defaultInformer(client versioned.Interface
 }
 
 func (f *instrumentationRuleInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.InstrumentationRule{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.InstrumentationRule{}, f.defaultInformer)
 }
 
-func (f *instrumentationRuleInformer) Lister() v1alpha1.InstrumentationRuleLister {
-	return v1alpha1.NewInstrumentationRuleLister(f.Informer().GetIndexer())
+func (f *instrumentationRuleInformer) Lister() odigosv1alpha1.InstrumentationRuleLister {
+	return odigosv1alpha1.NewInstrumentationRuleLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentedapplication.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentedapplication.go
index e7e958108d..f8039eb1ab 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentedapplication.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/instrumentedapplication.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // InstrumentedApplications.
 type InstrumentedApplicationInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.InstrumentedApplicationLister
+	Lister() odigosv1alpha1.InstrumentedApplicationLister
 }
 
 type instrumentedApplicationInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredInstrumentedApplicationInformer(client versioned.Interface, name
 				return client.OdigosV1alpha1().InstrumentedApplications(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.InstrumentedApplication{},
+		&apiodigosv1alpha1.InstrumentedApplication{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *instrumentedApplicationInformer) defaultInformer(client versioned.Inter
 }
 
 func (f *instrumentedApplicationInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.InstrumentedApplication{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.InstrumentedApplication{}, f.defaultInformer)
 }
 
-func (f *instrumentedApplicationInformer) Lister() v1alpha1.InstrumentedApplicationLister {
-	return v1alpha1.NewInstrumentedApplicationLister(f.Informer().GetIndexer())
+func (f *instrumentedApplicationInformer) Lister() odigosv1alpha1.InstrumentedApplicationLister {
+	return odigosv1alpha1.NewInstrumentedApplicationLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/odigosconfiguration.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/odigosconfiguration.go
index 47a4b377e9..c2fe958888 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/odigosconfiguration.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/odigosconfiguration.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // OdigosConfigurations.
 type OdigosConfigurationInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.OdigosConfigurationLister
+	Lister() odigosv1alpha1.OdigosConfigurationLister
 }
 
 type odigosConfigurationInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredOdigosConfigurationInformer(client versioned.Interface, namespac
 				return client.OdigosV1alpha1().OdigosConfigurations(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.OdigosConfiguration{},
+		&apiodigosv1alpha1.OdigosConfiguration{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *odigosConfigurationInformer) defaultInformer(client versioned.Interface
 }
 
 func (f *odigosConfigurationInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.OdigosConfiguration{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.OdigosConfiguration{}, f.defaultInformer)
 }
 
-func (f *odigosConfigurationInformer) Lister() v1alpha1.OdigosConfigurationLister {
-	return v1alpha1.NewOdigosConfigurationLister(f.Informer().GetIndexer())
+func (f *odigosConfigurationInformer) Lister() odigosv1alpha1.OdigosConfigurationLister {
+	return odigosv1alpha1.NewOdigosConfigurationLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/processor.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/processor.go
index 7a294f7cef..0a35aca980 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/processor.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/processor.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // Processors.
 type ProcessorInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.ProcessorLister
+	Lister() odigosv1alpha1.ProcessorLister
 }
 
 type processorInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredProcessorInformer(client versioned.Interface, namespace string,
 				return client.OdigosV1alpha1().Processors(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.Processor{},
+		&apiodigosv1alpha1.Processor{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *processorInformer) defaultInformer(client versioned.Interface, resyncPe
 }
 
 func (f *processorInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.Processor{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.Processor{}, f.defaultInformer)
 }
 
-func (f *processorInformer) Lister() v1alpha1.ProcessorLister {
-	return v1alpha1.NewProcessorLister(f.Informer().GetIndexer())
+func (f *processorInformer) Lister() odigosv1alpha1.ProcessorLister {
+	return odigosv1alpha1.NewProcessorLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/source.go b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/source.go
index a74144c7b0..9eb5e72208 100644
--- a/api/generated/odigos/informers/externalversions/odigos/v1alpha1/source.go
+++ b/api/generated/odigos/informers/externalversions/odigos/v1alpha1/source.go
@@ -18,13 +18,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"context"
+	context "context"
 	time "time"
 
 	versioned "github.com/odigos-io/odigos/api/generated/odigos/clientset/versioned"
 	internalinterfaces "github.com/odigos-io/odigos/api/generated/odigos/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
-	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/generated/odigos/listers/odigos/v1alpha1"
+	apiodigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -35,7 +35,7 @@ import (
 // Sources.
 type SourceInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.SourceLister
+	Lister() odigosv1alpha1.SourceLister
 }
 
 type sourceInformer struct {
@@ -70,7 +70,7 @@ func NewFilteredSourceInformer(client versioned.Interface, namespace string, res
 				return client.OdigosV1alpha1().Sources(namespace).Watch(context.TODO(), options)
 			},
 		},
-		&odigosv1alpha1.Source{},
+		&apiodigosv1alpha1.Source{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,9 +81,9 @@ func (f *sourceInformer) defaultInformer(client versioned.Interface, resyncPerio
 }
 
 func (f *sourceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&odigosv1alpha1.Source{}, f.defaultInformer)
+	return f.factory.InformerFor(&apiodigosv1alpha1.Source{}, f.defaultInformer)
 }
 
-func (f *sourceInformer) Lister() v1alpha1.SourceLister {
-	return v1alpha1.NewSourceLister(f.Informer().GetIndexer())
+func (f *sourceInformer) Lister() odigosv1alpha1.SourceLister {
+	return odigosv1alpha1.NewSourceLister(f.Informer().GetIndexer())
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/collectorsgroup.go b/api/generated/odigos/listers/odigos/v1alpha1/collectorsgroup.go
index fd52d62343..f85263856c 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/collectorsgroup.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/collectorsgroup.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // CollectorsGroupLister helps list CollectorsGroups.
@@ -29,7 +29,7 @@ import (
 type CollectorsGroupLister interface {
 	// List lists all CollectorsGroups in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.CollectorsGroup, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.CollectorsGroup, err error)
 	// CollectorsGroups returns an object that can list and get CollectorsGroups.
 	CollectorsGroups(namespace string) CollectorsGroupNamespaceLister
 	CollectorsGroupListerExpansion
@@ -37,17 +37,17 @@ type CollectorsGroupLister interface {
 
 // collectorsGroupLister implements the CollectorsGroupLister interface.
 type collectorsGroupLister struct {
-	listers.ResourceIndexer[*v1alpha1.CollectorsGroup]
+	listers.ResourceIndexer[*odigosv1alpha1.CollectorsGroup]
 }
 
 // NewCollectorsGroupLister returns a new CollectorsGroupLister.
 func NewCollectorsGroupLister(indexer cache.Indexer) CollectorsGroupLister {
-	return &collectorsGroupLister{listers.New[*v1alpha1.CollectorsGroup](indexer, v1alpha1.Resource("collectorsgroup"))}
+	return &collectorsGroupLister{listers.New[*odigosv1alpha1.CollectorsGroup](indexer, odigosv1alpha1.Resource("collectorsgroup"))}
 }
 
 // CollectorsGroups returns an object that can list and get CollectorsGroups.
 func (s *collectorsGroupLister) CollectorsGroups(namespace string) CollectorsGroupNamespaceLister {
-	return collectorsGroupNamespaceLister{listers.NewNamespaced[*v1alpha1.CollectorsGroup](s.ResourceIndexer, namespace)}
+	return collectorsGroupNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.CollectorsGroup](s.ResourceIndexer, namespace)}
 }
 
 // CollectorsGroupNamespaceLister helps list and get CollectorsGroups.
@@ -55,15 +55,15 @@ func (s *collectorsGroupLister) CollectorsGroups(namespace string) CollectorsGro
 type CollectorsGroupNamespaceLister interface {
 	// List lists all CollectorsGroups in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.CollectorsGroup, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.CollectorsGroup, err error)
 	// Get retrieves the CollectorsGroup from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.CollectorsGroup, error)
+	Get(name string) (*odigosv1alpha1.CollectorsGroup, error)
 	CollectorsGroupNamespaceListerExpansion
 }
 
 // collectorsGroupNamespaceLister implements the CollectorsGroupNamespaceLister
 // interface.
 type collectorsGroupNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.CollectorsGroup]
+	listers.ResourceIndexer[*odigosv1alpha1.CollectorsGroup]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/destination.go b/api/generated/odigos/listers/odigos/v1alpha1/destination.go
index 229fd89c7a..0f636cc285 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/destination.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/destination.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // DestinationLister helps list Destinations.
@@ -29,7 +29,7 @@ import (
 type DestinationLister interface {
 	// List lists all Destinations in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.Destination, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.Destination, err error)
 	// Destinations returns an object that can list and get Destinations.
 	Destinations(namespace string) DestinationNamespaceLister
 	DestinationListerExpansion
@@ -37,17 +37,17 @@ type DestinationLister interface {
 
 // destinationLister implements the DestinationLister interface.
 type destinationLister struct {
-	listers.ResourceIndexer[*v1alpha1.Destination]
+	listers.ResourceIndexer[*odigosv1alpha1.Destination]
 }
 
 // NewDestinationLister returns a new DestinationLister.
 func NewDestinationLister(indexer cache.Indexer) DestinationLister {
-	return &destinationLister{listers.New[*v1alpha1.Destination](indexer, v1alpha1.Resource("destination"))}
+	return &destinationLister{listers.New[*odigosv1alpha1.Destination](indexer, odigosv1alpha1.Resource("destination"))}
 }
 
 // Destinations returns an object that can list and get Destinations.
 func (s *destinationLister) Destinations(namespace string) DestinationNamespaceLister {
-	return destinationNamespaceLister{listers.NewNamespaced[*v1alpha1.Destination](s.ResourceIndexer, namespace)}
+	return destinationNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.Destination](s.ResourceIndexer, namespace)}
 }
 
 // DestinationNamespaceLister helps list and get Destinations.
@@ -55,15 +55,15 @@ func (s *destinationLister) Destinations(namespace string) DestinationNamespaceL
 type DestinationNamespaceLister interface {
 	// List lists all Destinations in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.Destination, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.Destination, err error)
 	// Get retrieves the Destination from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.Destination, error)
+	Get(name string) (*odigosv1alpha1.Destination, error)
 	DestinationNamespaceListerExpansion
 }
 
 // destinationNamespaceLister implements the DestinationNamespaceLister
 // interface.
 type destinationNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.Destination]
+	listers.ResourceIndexer[*odigosv1alpha1.Destination]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/instrumentationconfig.go b/api/generated/odigos/listers/odigos/v1alpha1/instrumentationconfig.go
index 773777ee3d..39e39443e5 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/instrumentationconfig.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/instrumentationconfig.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // InstrumentationConfigLister helps list InstrumentationConfigs.
@@ -29,7 +29,7 @@ import (
 type InstrumentationConfigLister interface {
 	// List lists all InstrumentationConfigs in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentationConfig, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentationConfig, err error)
 	// InstrumentationConfigs returns an object that can list and get InstrumentationConfigs.
 	InstrumentationConfigs(namespace string) InstrumentationConfigNamespaceLister
 	InstrumentationConfigListerExpansion
@@ -37,17 +37,17 @@ type InstrumentationConfigLister interface {
 
 // instrumentationConfigLister implements the InstrumentationConfigLister interface.
 type instrumentationConfigLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentationConfig]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentationConfig]
 }
 
 // NewInstrumentationConfigLister returns a new InstrumentationConfigLister.
 func NewInstrumentationConfigLister(indexer cache.Indexer) InstrumentationConfigLister {
-	return &instrumentationConfigLister{listers.New[*v1alpha1.InstrumentationConfig](indexer, v1alpha1.Resource("instrumentationconfig"))}
+	return &instrumentationConfigLister{listers.New[*odigosv1alpha1.InstrumentationConfig](indexer, odigosv1alpha1.Resource("instrumentationconfig"))}
 }
 
 // InstrumentationConfigs returns an object that can list and get InstrumentationConfigs.
 func (s *instrumentationConfigLister) InstrumentationConfigs(namespace string) InstrumentationConfigNamespaceLister {
-	return instrumentationConfigNamespaceLister{listers.NewNamespaced[*v1alpha1.InstrumentationConfig](s.ResourceIndexer, namespace)}
+	return instrumentationConfigNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.InstrumentationConfig](s.ResourceIndexer, namespace)}
 }
 
 // InstrumentationConfigNamespaceLister helps list and get InstrumentationConfigs.
@@ -55,15 +55,15 @@ func (s *instrumentationConfigLister) InstrumentationConfigs(namespace string) I
 type InstrumentationConfigNamespaceLister interface {
 	// List lists all InstrumentationConfigs in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentationConfig, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentationConfig, err error)
 	// Get retrieves the InstrumentationConfig from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.InstrumentationConfig, error)
+	Get(name string) (*odigosv1alpha1.InstrumentationConfig, error)
 	InstrumentationConfigNamespaceListerExpansion
 }
 
 // instrumentationConfigNamespaceLister implements the InstrumentationConfigNamespaceLister
 // interface.
 type instrumentationConfigNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentationConfig]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentationConfig]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/instrumentationinstance.go b/api/generated/odigos/listers/odigos/v1alpha1/instrumentationinstance.go
index d3240cdc3c..ce86adb225 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/instrumentationinstance.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/instrumentationinstance.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // InstrumentationInstanceLister helps list InstrumentationInstances.
@@ -29,7 +29,7 @@ import (
 type InstrumentationInstanceLister interface {
 	// List lists all InstrumentationInstances in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentationInstance, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentationInstance, err error)
 	// InstrumentationInstances returns an object that can list and get InstrumentationInstances.
 	InstrumentationInstances(namespace string) InstrumentationInstanceNamespaceLister
 	InstrumentationInstanceListerExpansion
@@ -37,17 +37,17 @@ type InstrumentationInstanceLister interface {
 
 // instrumentationInstanceLister implements the InstrumentationInstanceLister interface.
 type instrumentationInstanceLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentationInstance]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentationInstance]
 }
 
 // NewInstrumentationInstanceLister returns a new InstrumentationInstanceLister.
 func NewInstrumentationInstanceLister(indexer cache.Indexer) InstrumentationInstanceLister {
-	return &instrumentationInstanceLister{listers.New[*v1alpha1.InstrumentationInstance](indexer, v1alpha1.Resource("instrumentationinstance"))}
+	return &instrumentationInstanceLister{listers.New[*odigosv1alpha1.InstrumentationInstance](indexer, odigosv1alpha1.Resource("instrumentationinstance"))}
 }
 
 // InstrumentationInstances returns an object that can list and get InstrumentationInstances.
 func (s *instrumentationInstanceLister) InstrumentationInstances(namespace string) InstrumentationInstanceNamespaceLister {
-	return instrumentationInstanceNamespaceLister{listers.NewNamespaced[*v1alpha1.InstrumentationInstance](s.ResourceIndexer, namespace)}
+	return instrumentationInstanceNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.InstrumentationInstance](s.ResourceIndexer, namespace)}
 }
 
 // InstrumentationInstanceNamespaceLister helps list and get InstrumentationInstances.
@@ -55,15 +55,15 @@ func (s *instrumentationInstanceLister) InstrumentationInstances(namespace strin
 type InstrumentationInstanceNamespaceLister interface {
 	// List lists all InstrumentationInstances in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentationInstance, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentationInstance, err error)
 	// Get retrieves the InstrumentationInstance from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.InstrumentationInstance, error)
+	Get(name string) (*odigosv1alpha1.InstrumentationInstance, error)
 	InstrumentationInstanceNamespaceListerExpansion
 }
 
 // instrumentationInstanceNamespaceLister implements the InstrumentationInstanceNamespaceLister
 // interface.
 type instrumentationInstanceNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentationInstance]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentationInstance]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/instrumentationrule.go b/api/generated/odigos/listers/odigos/v1alpha1/instrumentationrule.go
index 7fc2736ecd..2868fa1d19 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/instrumentationrule.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/instrumentationrule.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // InstrumentationRuleLister helps list InstrumentationRules.
@@ -29,7 +29,7 @@ import (
 type InstrumentationRuleLister interface {
 	// List lists all InstrumentationRules in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentationRule, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentationRule, err error)
 	// InstrumentationRules returns an object that can list and get InstrumentationRules.
 	InstrumentationRules(namespace string) InstrumentationRuleNamespaceLister
 	InstrumentationRuleListerExpansion
@@ -37,17 +37,17 @@ type InstrumentationRuleLister interface {
 
 // instrumentationRuleLister implements the InstrumentationRuleLister interface.
 type instrumentationRuleLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentationRule]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentationRule]
 }
 
 // NewInstrumentationRuleLister returns a new InstrumentationRuleLister.
 func NewInstrumentationRuleLister(indexer cache.Indexer) InstrumentationRuleLister {
-	return &instrumentationRuleLister{listers.New[*v1alpha1.InstrumentationRule](indexer, v1alpha1.Resource("instrumentationrule"))}
+	return &instrumentationRuleLister{listers.New[*odigosv1alpha1.InstrumentationRule](indexer, odigosv1alpha1.Resource("instrumentationrule"))}
 }
 
 // InstrumentationRules returns an object that can list and get InstrumentationRules.
 func (s *instrumentationRuleLister) InstrumentationRules(namespace string) InstrumentationRuleNamespaceLister {
-	return instrumentationRuleNamespaceLister{listers.NewNamespaced[*v1alpha1.InstrumentationRule](s.ResourceIndexer, namespace)}
+	return instrumentationRuleNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.InstrumentationRule](s.ResourceIndexer, namespace)}
 }
 
 // InstrumentationRuleNamespaceLister helps list and get InstrumentationRules.
@@ -55,15 +55,15 @@ func (s *instrumentationRuleLister) InstrumentationRules(namespace string) Instr
 type InstrumentationRuleNamespaceLister interface {
 	// List lists all InstrumentationRules in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentationRule, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentationRule, err error)
 	// Get retrieves the InstrumentationRule from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.InstrumentationRule, error)
+	Get(name string) (*odigosv1alpha1.InstrumentationRule, error)
 	InstrumentationRuleNamespaceListerExpansion
 }
 
 // instrumentationRuleNamespaceLister implements the InstrumentationRuleNamespaceLister
 // interface.
 type instrumentationRuleNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentationRule]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentationRule]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/instrumentedapplication.go b/api/generated/odigos/listers/odigos/v1alpha1/instrumentedapplication.go
index b178a0eef5..3a96e63444 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/instrumentedapplication.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/instrumentedapplication.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // InstrumentedApplicationLister helps list InstrumentedApplications.
@@ -29,7 +29,7 @@ import (
 type InstrumentedApplicationLister interface {
 	// List lists all InstrumentedApplications in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentedApplication, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentedApplication, err error)
 	// InstrumentedApplications returns an object that can list and get InstrumentedApplications.
 	InstrumentedApplications(namespace string) InstrumentedApplicationNamespaceLister
 	InstrumentedApplicationListerExpansion
@@ -37,17 +37,17 @@ type InstrumentedApplicationLister interface {
 
 // instrumentedApplicationLister implements the InstrumentedApplicationLister interface.
 type instrumentedApplicationLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentedApplication]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentedApplication]
 }
 
 // NewInstrumentedApplicationLister returns a new InstrumentedApplicationLister.
 func NewInstrumentedApplicationLister(indexer cache.Indexer) InstrumentedApplicationLister {
-	return &instrumentedApplicationLister{listers.New[*v1alpha1.InstrumentedApplication](indexer, v1alpha1.Resource("instrumentedapplication"))}
+	return &instrumentedApplicationLister{listers.New[*odigosv1alpha1.InstrumentedApplication](indexer, odigosv1alpha1.Resource("instrumentedapplication"))}
 }
 
 // InstrumentedApplications returns an object that can list and get InstrumentedApplications.
 func (s *instrumentedApplicationLister) InstrumentedApplications(namespace string) InstrumentedApplicationNamespaceLister {
-	return instrumentedApplicationNamespaceLister{listers.NewNamespaced[*v1alpha1.InstrumentedApplication](s.ResourceIndexer, namespace)}
+	return instrumentedApplicationNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.InstrumentedApplication](s.ResourceIndexer, namespace)}
 }
 
 // InstrumentedApplicationNamespaceLister helps list and get InstrumentedApplications.
@@ -55,15 +55,15 @@ func (s *instrumentedApplicationLister) InstrumentedApplications(namespace strin
 type InstrumentedApplicationNamespaceLister interface {
 	// List lists all InstrumentedApplications in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.InstrumentedApplication, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.InstrumentedApplication, err error)
 	// Get retrieves the InstrumentedApplication from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.InstrumentedApplication, error)
+	Get(name string) (*odigosv1alpha1.InstrumentedApplication, error)
 	InstrumentedApplicationNamespaceListerExpansion
 }
 
 // instrumentedApplicationNamespaceLister implements the InstrumentedApplicationNamespaceLister
 // interface.
 type instrumentedApplicationNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.InstrumentedApplication]
+	listers.ResourceIndexer[*odigosv1alpha1.InstrumentedApplication]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/odigosconfiguration.go b/api/generated/odigos/listers/odigos/v1alpha1/odigosconfiguration.go
index f305af4ebd..513eac26c8 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/odigosconfiguration.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/odigosconfiguration.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // OdigosConfigurationLister helps list OdigosConfigurations.
@@ -29,7 +29,7 @@ import (
 type OdigosConfigurationLister interface {
 	// List lists all OdigosConfigurations in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.OdigosConfiguration, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.OdigosConfiguration, err error)
 	// OdigosConfigurations returns an object that can list and get OdigosConfigurations.
 	OdigosConfigurations(namespace string) OdigosConfigurationNamespaceLister
 	OdigosConfigurationListerExpansion
@@ -37,17 +37,17 @@ type OdigosConfigurationLister interface {
 
 // odigosConfigurationLister implements the OdigosConfigurationLister interface.
 type odigosConfigurationLister struct {
-	listers.ResourceIndexer[*v1alpha1.OdigosConfiguration]
+	listers.ResourceIndexer[*odigosv1alpha1.OdigosConfiguration]
 }
 
 // NewOdigosConfigurationLister returns a new OdigosConfigurationLister.
 func NewOdigosConfigurationLister(indexer cache.Indexer) OdigosConfigurationLister {
-	return &odigosConfigurationLister{listers.New[*v1alpha1.OdigosConfiguration](indexer, v1alpha1.Resource("odigosconfiguration"))}
+	return &odigosConfigurationLister{listers.New[*odigosv1alpha1.OdigosConfiguration](indexer, odigosv1alpha1.Resource("odigosconfiguration"))}
 }
 
 // OdigosConfigurations returns an object that can list and get OdigosConfigurations.
 func (s *odigosConfigurationLister) OdigosConfigurations(namespace string) OdigosConfigurationNamespaceLister {
-	return odigosConfigurationNamespaceLister{listers.NewNamespaced[*v1alpha1.OdigosConfiguration](s.ResourceIndexer, namespace)}
+	return odigosConfigurationNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.OdigosConfiguration](s.ResourceIndexer, namespace)}
 }
 
 // OdigosConfigurationNamespaceLister helps list and get OdigosConfigurations.
@@ -55,15 +55,15 @@ func (s *odigosConfigurationLister) OdigosConfigurations(namespace string) Odigo
 type OdigosConfigurationNamespaceLister interface {
 	// List lists all OdigosConfigurations in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.OdigosConfiguration, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.OdigosConfiguration, err error)
 	// Get retrieves the OdigosConfiguration from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.OdigosConfiguration, error)
+	Get(name string) (*odigosv1alpha1.OdigosConfiguration, error)
 	OdigosConfigurationNamespaceListerExpansion
 }
 
 // odigosConfigurationNamespaceLister implements the OdigosConfigurationNamespaceLister
 // interface.
 type odigosConfigurationNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.OdigosConfiguration]
+	listers.ResourceIndexer[*odigosv1alpha1.OdigosConfiguration]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/processor.go b/api/generated/odigos/listers/odigos/v1alpha1/processor.go
index 9e15c67fa1..d1f8f1fb15 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/processor.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/processor.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // ProcessorLister helps list Processors.
@@ -29,7 +29,7 @@ import (
 type ProcessorLister interface {
 	// List lists all Processors in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.Processor, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.Processor, err error)
 	// Processors returns an object that can list and get Processors.
 	Processors(namespace string) ProcessorNamespaceLister
 	ProcessorListerExpansion
@@ -37,17 +37,17 @@ type ProcessorLister interface {
 
 // processorLister implements the ProcessorLister interface.
 type processorLister struct {
-	listers.ResourceIndexer[*v1alpha1.Processor]
+	listers.ResourceIndexer[*odigosv1alpha1.Processor]
 }
 
 // NewProcessorLister returns a new ProcessorLister.
 func NewProcessorLister(indexer cache.Indexer) ProcessorLister {
-	return &processorLister{listers.New[*v1alpha1.Processor](indexer, v1alpha1.Resource("processor"))}
+	return &processorLister{listers.New[*odigosv1alpha1.Processor](indexer, odigosv1alpha1.Resource("processor"))}
 }
 
 // Processors returns an object that can list and get Processors.
 func (s *processorLister) Processors(namespace string) ProcessorNamespaceLister {
-	return processorNamespaceLister{listers.NewNamespaced[*v1alpha1.Processor](s.ResourceIndexer, namespace)}
+	return processorNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.Processor](s.ResourceIndexer, namespace)}
 }
 
 // ProcessorNamespaceLister helps list and get Processors.
@@ -55,15 +55,15 @@ func (s *processorLister) Processors(namespace string) ProcessorNamespaceLister
 type ProcessorNamespaceLister interface {
 	// List lists all Processors in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.Processor, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.Processor, err error)
 	// Get retrieves the Processor from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.Processor, error)
+	Get(name string) (*odigosv1alpha1.Processor, error)
 	ProcessorNamespaceListerExpansion
 }
 
 // processorNamespaceLister implements the ProcessorNamespaceLister
 // interface.
 type processorNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.Processor]
+	listers.ResourceIndexer[*odigosv1alpha1.Processor]
 }
diff --git a/api/generated/odigos/listers/odigos/v1alpha1/source.go b/api/generated/odigos/listers/odigos/v1alpha1/source.go
index 36dd5f7b3d..b830d92314 100644
--- a/api/generated/odigos/listers/odigos/v1alpha1/source.go
+++ b/api/generated/odigos/listers/odigos/v1alpha1/source.go
@@ -18,10 +18,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/listers"
-	"k8s.io/client-go/tools/cache"
+	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
 )
 
 // SourceLister helps list Sources.
@@ -29,7 +29,7 @@ import (
 type SourceLister interface {
 	// List lists all Sources in the indexer.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.Source, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.Source, err error)
 	// Sources returns an object that can list and get Sources.
 	Sources(namespace string) SourceNamespaceLister
 	SourceListerExpansion
@@ -37,17 +37,17 @@ type SourceLister interface {
 
 // sourceLister implements the SourceLister interface.
 type sourceLister struct {
-	listers.ResourceIndexer[*v1alpha1.Source]
+	listers.ResourceIndexer[*odigosv1alpha1.Source]
 }
 
 // NewSourceLister returns a new SourceLister.
 func NewSourceLister(indexer cache.Indexer) SourceLister {
-	return &sourceLister{listers.New[*v1alpha1.Source](indexer, v1alpha1.Resource("source"))}
+	return &sourceLister{listers.New[*odigosv1alpha1.Source](indexer, odigosv1alpha1.Resource("source"))}
 }
 
 // Sources returns an object that can list and get Sources.
 func (s *sourceLister) Sources(namespace string) SourceNamespaceLister {
-	return sourceNamespaceLister{listers.NewNamespaced[*v1alpha1.Source](s.ResourceIndexer, namespace)}
+	return sourceNamespaceLister{listers.NewNamespaced[*odigosv1alpha1.Source](s.ResourceIndexer, namespace)}
 }
 
 // SourceNamespaceLister helps list and get Sources.
@@ -55,15 +55,15 @@ func (s *sourceLister) Sources(namespace string) SourceNamespaceLister {
 type SourceNamespaceLister interface {
 	// List lists all Sources in the indexer for a given namespace.
 	// Objects returned here must be treated as read-only.
-	List(selector labels.Selector) (ret []*v1alpha1.Source, err error)
+	List(selector labels.Selector) (ret []*odigosv1alpha1.Source, err error)
 	// Get retrieves the Source from the indexer for a given namespace and name.
 	// Objects returned here must be treated as read-only.
-	Get(name string) (*v1alpha1.Source, error)
+	Get(name string) (*odigosv1alpha1.Source, error)
 	SourceNamespaceListerExpansion
 }
 
 // sourceNamespaceLister implements the SourceNamespaceLister
 // interface.
 type sourceNamespaceLister struct {
-	listers.ResourceIndexer[*v1alpha1.Source]
+	listers.ResourceIndexer[*odigosv1alpha1.Source]
 }
diff --git a/api/go.mod b/api/go.mod
index 2cb5e65903..945499ef74 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -6,12 +6,12 @@ require (
 	github.com/odigos-io/odigos/common v0.0.0
 	github.com/odigos-io/odigos/k8sutils v0.0.0
 	github.com/stretchr/testify v1.9.0
-	k8s.io/api v0.31.0
-	k8s.io/apimachinery v0.31.0
-	k8s.io/client-go v0.31.0
-	k8s.io/code-generator v0.31.0
+	k8s.io/api v0.32.0
+	k8s.io/apimachinery v0.32.0
+	k8s.io/client-go v0.32.0
+	k8s.io/code-generator v0.32.0
 	sigs.k8s.io/controller-runtime v0.19.0
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2
 )
 
 require (
@@ -29,9 +29,9 @@ require (
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/fatih/color v1.10.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/goccy/go-yaml v1.11.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -51,25 +51,24 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.opentelemetry.io/otel v1.29.0
 	go.opentelemetry.io/otel/trace v1.29.0 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.31.0
-	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
 	sigs.k8s.io/yaml v1.4.0
 )
 
diff --git a/api/go.sum b/api/go.sum
index 3981a3c1a7..cd30a84761 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -15,13 +15,14 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/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/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
@@ -44,14 +45,12 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
 github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -80,10 +79,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
-github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
-github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -119,20 +118,20 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU=
 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 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/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -145,30 +144,30 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -176,35 +175,32 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
-k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
+k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
+k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
 k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
 k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
-k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
-k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
-k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
-k8s.io/code-generator v0.31.0 h1:w607nrMi1KeDKB3/F/J4lIoOgAwc+gV9ZKew4XRfMp8=
-k8s.io/code-generator v0.31.0/go.mod h1:84y4w3es8rOJOUUP1rLsIiGlO1JuEaPFXQPA9e/K6U0=
-k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
-k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
+k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
+k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
+k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
+k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
+k8s.io/code-generator v0.32.0 h1:s0lNN8VSWny8LBz5t5iy7MCdgwdOhdg7vAGVxvS+VWU=
+k8s.io/code-generator v0.32.0/go.mod h1:b7Q7KMZkvsYFy72A79QYjiv4aTz3GvW0f1T3UfhFq4s=
+k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4=
+k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
 sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/frontend/go.mod b/frontend/go.mod
index 12ef0a5f10..af8271f932 100644
--- a/frontend/go.mod
+++ b/frontend/go.mod
@@ -22,9 +22,9 @@ require (
 	go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1
 	go.opentelemetry.io/otel v1.29.0
 	golang.org/x/sync v0.10.0
-	k8s.io/api v0.31.0
-	k8s.io/apimachinery v0.31.0
-	k8s.io/client-go v0.31.0
+	k8s.io/api v0.32.0
+	k8s.io/apimachinery v0.32.0
+	k8s.io/client-go v0.32.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -90,9 +90,9 @@ require (
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.1 // indirect
@@ -106,7 +106,6 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
@@ -133,23 +132,23 @@ require (
 	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
 	sigs.k8s.io/controller-runtime v0.19.0 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 )
 
 replace (
diff --git a/frontend/go.sum b/frontend/go.sum
index 1bc1d38f13..bad233c41a 100644
--- a/frontend/go.sum
+++ b/frontend/go.sum
@@ -57,13 +57,14 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 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/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -101,8 +102,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
@@ -113,8 +114,6 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe
 github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -167,10 +166,10 @@ github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mL
 github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
-github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
-github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
 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=
@@ -349,8 +348,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -378,14 +377,14 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -400,8 +399,8 @@ google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
 google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -411,34 +410,32 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
-k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
+k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
+k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
 k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
 k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
-k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
-k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
-k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
+k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
+k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
+k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
+k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
 sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/k8sutils/go.mod b/k8sutils/go.mod
index 8db32c9f3e..c8e40928fa 100644
--- a/k8sutils/go.mod
+++ b/k8sutils/go.mod
@@ -6,9 +6,9 @@ require (
 	github.com/odigos-io/odigos/api v0.0.0
 	github.com/odigos-io/odigos/common v0.0.0
 	github.com/tj/assert v0.0.3
-	k8s.io/api v0.31.0
-	k8s.io/apimachinery v0.31.0
-	k8s.io/client-go v0.31.0
+	k8s.io/api v0.32.0
+	k8s.io/apimachinery v0.32.0
+	k8s.io/client-go v0.32.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -18,16 +18,15 @@ require (
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fatih/color v1.10.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/goccy/go-yaml v1.11.3 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
@@ -41,14 +40,15 @@ require (
 	go.opentelemetry.io/otel v1.29.0 // indirect
 	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
 )
 
 require (
@@ -58,17 +58,16 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	google.golang.org/grpc v1.68.1
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/cri-api v0.31.3
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
 	sigs.k8s.io/controller-runtime v0.19.0
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 )
 
 replace (
diff --git a/k8sutils/go.sum b/k8sutils/go.sum
index 6624568c0e..ca021e5ec6 100644
--- a/k8sutils/go.sum
+++ b/k8sutils/go.sum
@@ -15,13 +15,14 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/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/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
@@ -44,14 +45,12 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
 github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -80,10 +79,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
-github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
-github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -120,8 +119,8 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU=
 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -130,8 +129,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -142,22 +141,22 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -168,8 +167,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
 google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -177,34 +176,31 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
-k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
+k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
+k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
 k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
 k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
-k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
-k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
-k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
+k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
+k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
+k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
+k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
 k8s.io/cri-api v0.31.3 h1:dsZXzrGrCEwHjsTDlAV7rutEplpMLY8bfNRMIqrtXjo=
 k8s.io/cri-api v0.31.3/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
 sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/opampserver/go.mod b/opampserver/go.mod
index b9ad12aeaf..7fdedfe6e0 100644
--- a/opampserver/go.mod
+++ b/opampserver/go.mod
@@ -9,15 +9,18 @@ require (
 	github.com/odigos-io/odigos/k8sutils v0.0.0
 	go.opentelemetry.io/otel v1.29.0
 	google.golang.org/grpc v1.68.1
-	google.golang.org/protobuf v1.34.2
-	k8s.io/api v0.31.0
-	k8s.io/apimachinery v0.31.0
-	k8s.io/client-go v0.31.0
+	google.golang.org/protobuf v1.35.1
+	k8s.io/api v0.32.0
+	k8s.io/apimachinery v0.32.0
+	k8s.io/client-go v0.32.0
 	k8s.io/kubelet v0.31.0
 	sigs.k8s.io/controller-runtime v0.19.0
 )
 
-require github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+require (
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+)
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -28,19 +31,17 @@ require (
 	github.com/fatih/color v1.10.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/goccy/go-yaml v1.11.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -60,24 +61,23 @@ require (
 	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.31.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
diff --git a/opampserver/go.sum b/opampserver/go.sum
index 8d1702a36c..e3ef612f56 100644
--- a/opampserver/go.sum
+++ b/opampserver/go.sum
@@ -23,13 +23,14 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/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/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
@@ -42,8 +43,6 @@ github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I=
 github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
@@ -54,14 +53,12 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
 github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -91,10 +88,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
-github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
-github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -140,8 +137,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU=
 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -150,8 +147,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -163,22 +160,22 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -191,8 +188,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
 google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -200,33 +197,30 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
-k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
+k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
+k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
 k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
 k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
-k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
-k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
-k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
+k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
+k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
+k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
+k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
 k8s.io/kubelet v0.31.0 h1:IlfkBy7QTojGEm97GuVGhtli0HL/Pgu4AdayiF76yWo=
 k8s.io/kubelet v0.31.0/go.mod h1:s+OnqnfdIh14PFpUb7NgzM53WSYXcczA3w/1qSzsRc8=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
 sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=