fix: processor CRD collector role enum new values and make orderHint …

…optional (#983)
odigos-io · Feb 18, 2024 · f03620b · f03620b
1 parent a475fc0
commit f03620b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/api/config/crd/bases/odigos.io_collectorsgroups.yaml b/api/config/crd/bases/odigos.io_collectorsgroups.yaml
@@ -39,8 +39,8 @@ spec:
                 type: string
               role:
                 enum:
-                - GATEWAY
-                - DATA_COLLECTION
+                - CLUSTER_GATEWAY
+                - NODE_COLLECTOR
                 type: string
             required:
             - role

diff --git a/api/config/crd/bases/odigos.io_processors.yaml b/api/config/crd/bases/odigos.io_processors.yaml
@@ -42,8 +42,8 @@ spec:
                   processor is attached to.
                 items:
                   enum:
-                  - GATEWAY
-                  - DATA_COLLECTION
+                  - CLUSTER_GATEWAY
+                  - NODE_COLLECTOR
                   type: string
                 type: array
               disabled:
@@ -91,7 +91,6 @@ spec:
                 type: string
             required:
             - collectorRoles
-            - orderHint
             - processorConfig
             - signals
             - type

diff --git a/api/odigos/v1alpha1/collectorsgroup_types.go b/api/odigos/v1alpha1/collectorsgroup_types.go
@@ -20,7 +20,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// +kubebuilder:validation:Enum=GATEWAY;DATA_COLLECTION
+// +kubebuilder:validation:Enum=CLUSTER_GATEWAY;NODE_COLLECTOR
 type CollectorsGroupRole string
 
 const (

diff --git a/api/odigos/v1alpha1/processor_types.go b/api/odigos/v1alpha1/processor_types.go
@@ -52,7 +52,7 @@ type ProcessorSpec struct {
 	// a processor with lower order hint value will be placed before other processors with higher value.
 	// if 2 processors have the same value, the order is arbitrary.
 	// if the value is missing (or 0) the processor can be placed anywhere in the pipeline
-	OrderHint int `json:"orderHint"`
+	OrderHint int `json:"orderHint,omitempty"`
 
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object