addressed feedback + update bundle

netobserv · Oct 10, 2023 · 3de9f1a · 3de9f1a
1 parent aeb6034
commit 3de9f1a
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 34 deletions.
diff --git a/api/v1beta1/flowcollector_types.go b/api/v1beta1/flowcollector_types.go
@@ -57,7 +57,7 @@ type FlowCollectorSpec struct {
 	// enriches them, generates metrics, and forwards them to the Loki persistence layer and/or any available exporter.
 	Processor FlowCollectorFLP `json:"processor,omitempty"`
 
-	// loki, the flow store, client settings.
+	// `loki`, the flow store, client settings.
 	Loki FlowCollectorLoki `json:"loki,omitempty"`
 
 	// `consolePlugin` defines the settings related to the OpenShift Console plugin, when available.

diff --git a/api/v1beta1/flowcollector_webhook.go b/api/v1beta1/flowcollector_webhook.go
@@ -57,18 +57,6 @@ func (r *FlowCollector) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 
-	// Processor
-	dst.Spec.Processor.LogTypes = restored.Spec.Processor.LogTypes
-	if restored.Spec.Processor.ConversationHeartbeatInterval != nil {
-		dst.Spec.Processor.ConversationHeartbeatInterval = restored.Spec.Processor.ConversationHeartbeatInterval
-	}
-	if restored.Spec.Processor.ConversationEndTimeout != nil {
-		dst.Spec.Processor.ConversationEndTimeout = restored.Spec.Processor.ConversationEndTimeout
-	}
-	if restored.Spec.Processor.Metrics.DisableAlerts != nil {
-		dst.Spec.Processor.Metrics.DisableAlerts = restored.Spec.Processor.Metrics.DisableAlerts
-	}
-
 	// Loki
 	dst.Spec.Loki.Mode = restored.Spec.Loki.Mode
 	dst.Spec.Loki.Manual = restored.Spec.Loki.Manual

diff --git a/api/v1beta2/flowcollector_types.go b/api/v1beta2/flowcollector_types.go
@@ -57,7 +57,7 @@ type FlowCollectorSpec struct {
 	// enriches them, generates metrics, and forwards them to the Loki persistence layer and/or any available exporter.
 	Processor FlowCollectorFLP `json:"processor,omitempty"`
 
-	// loki, the flow store, client settings.
+	// `loki`, the flow store, client settings.
 	Loki FlowCollectorLoki `json:"loki,omitempty"`
 
 	// `consolePlugin` defines the settings related to the OpenShift Console plugin, when available.

diff --git a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml
@@ -3708,7 +3708,7 @@ spec:
                 - topic
                 type: object
               loki:
-                description: loki, the flow store, client settings.
+                description: '`loki`, the flow store, client settings.'
                 properties:
                   authToken:
                     default: DISABLED
@@ -5967,7 +5967,7 @@ spec:
                   properties:
                     ipfix:
                       description: IPFIX configuration, such as the IP address and
-                        port to send enriched IPFIX flows to. [Unsupported (*)].
+                        port to send enriched IPFIX flows to.
                       properties:
                         targetHost:
                           default: ""
@@ -6165,7 +6165,7 @@ spec:
                       type: object
                     type:
                       description: '`type` selects the type of exporters. The available
-                        options are `KAFKA` and `IPFIX`. `IPFIX` is unsupported (*).'
+                        options are `KAFKA` and `IPFIX`.'
                       enum:
                       - KAFKA
                       - IPFIX
@@ -6343,7 +6343,7 @@ spec:
                 - topic
                 type: object
               loki:
-                description: loki, the flow store, client settings.
+                description: '`loki`, the flow store, client settings.'
                 properties:
                   batchSize:
                     default: 102400

diff --git a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml
@@ -3694,7 +3694,7 @@ spec:
                 - topic
                 type: object
               loki:
-                description: loki, the flow store, client settings.
+                description: '`loki`, the flow store, client settings.'
                 properties:
                   authToken:
                     default: DISABLED
@@ -5953,7 +5953,7 @@ spec:
                   properties:
                     ipfix:
                       description: IPFIX configuration, such as the IP address and
-                        port to send enriched IPFIX flows to. [Unsupported (*)].
+                        port to send enriched IPFIX flows to.
                       properties:
                         targetHost:
                           default: ""
@@ -6151,7 +6151,7 @@ spec:
                       type: object
                     type:
                       description: '`type` selects the type of exporters. The available
-                        options are `KAFKA` and `IPFIX`. `IPFIX` is unsupported (*).'
+                        options are `KAFKA` and `IPFIX`.'
                       enum:
                       - KAFKA
                       - IPFIX
@@ -6329,7 +6329,7 @@ spec:
                 - topic
                 type: object
               loki:
-                description: loki, the flow store, client settings.
+                description: '`loki`, the flow store, client settings.'
                 properties:
                   batchSize:
                     default: 102400

diff --git a/docs/FlowCollector.md b/docs/FlowCollector.md
@@ -4071,7 +4071,7 @@ Defines the desired state of the FlowCollector resource. <br><br> *: the mention
         <td><b><a href="#flowcollectorspecloki-1">loki</a></b></td>
         <td>object</td>
         <td>
-          loki, the flow store, client settings.<br/>
+          `loki`, the flow store, client settings.<br/>
         </td>
         <td>false</td>
       </tr><tr>
@@ -6526,7 +6526,7 @@ TLS client configuration. When using TLS, verify that the address matches the Ka
 
 
 
-loki, the flow store, client settings.
+`loki`, the flow store, client settings.
 
 <table>
     <thead>
@@ -8699,7 +8699,7 @@ Defines the desired state of the FlowCollector resource. <br><br> *: the mention
         <td><b><a href="#flowcollectorspecloki-1">loki</a></b></td>
         <td>object</td>
         <td>
-          loki, the flow store, client settings.<br/>
+          `loki`, the flow store, client settings.<br/>
         </td>
         <td>false</td>
       </tr><tr>
@@ -10341,7 +10341,7 @@ ResourceClaim references one entry in PodSpec.ResourceClaims.
         <td><b>type</b></td>
         <td>enum</td>
         <td>
-          `type` selects the type of exporters. The available options are `KAFKA` and `IPFIX`. `IPFIX` is unsupported (*).<br/>
+          `type` selects the type of exporters. The available options are `KAFKA` and `IPFIX`.<br/>
           <br/>
             <i>Enum</i>: KAFKA, IPFIX<br/>
         </td>
@@ -10350,7 +10350,7 @@ ResourceClaim references one entry in PodSpec.ResourceClaims.
         <td><b><a href="#flowcollectorspecexportersindexipfix-1">ipfix</a></b></td>
         <td>object</td>
         <td>
-          IPFIX configuration, such as the IP address and port to send enriched IPFIX flows to. [Unsupported (*)].<br/>
+          IPFIX configuration, such as the IP address and port to send enriched IPFIX flows to.<br/>
         </td>
         <td>false</td>
       </tr><tr>
@@ -10369,7 +10369,7 @@ ResourceClaim references one entry in PodSpec.ResourceClaims.
 
 
 
-IPFIX configuration, such as the IP address and port to send enriched IPFIX flows to. [Unsupported (*)].
+IPFIX configuration, such as the IP address and port to send enriched IPFIX flows to.
 
 <table>
     <thead>
@@ -11154,7 +11154,7 @@ TLS client configuration. When using TLS, verify that the address matches the Ka
 
 
 
-loki, the flow store, client settings.
+`loki`, the flow store, client settings.
 
 <table>
     <thead>

diff --git a/hack/cloned.flows.netobserv.io_flowcollectors.yaml b/hack/cloned.flows.netobserv.io_flowcollectors.yaml
@@ -1244,7 +1244,7 @@ spec:
                 - topic
                 type: object
               loki:
-                description: loki, the flow store, client settings.
+                description: '`loki`, the flow store, client settings.'
                 properties:
                   authToken:
                     default: DISABLED
@@ -3694,7 +3694,7 @@ spec:
                 - topic
                 type: object
               loki:
-                description: loki, the flow store, client settings.
+                description: '`loki`, the flow store, client settings.'
                 properties:
                   authToken:
                     default: DISABLED
@@ -5953,7 +5953,7 @@ spec:
                   properties:
                     ipfix:
                       description: IPFIX configuration, such as the IP address and
-                        port to send enriched IPFIX flows to. [Unsupported (*)].
+                        port to send enriched IPFIX flows to.
                       properties:
                         targetHost:
                           default: ""
@@ -6151,7 +6151,7 @@ spec:
                       type: object
                     type:
                       description: '`type` selects the type of exporters. The available
-                        options are `KAFKA` and `IPFIX`. `IPFIX` is unsupported (*).'
+                        options are `KAFKA` and `IPFIX`.'
                       enum:
                       - KAFKA
                       - IPFIX
@@ -6329,7 +6329,7 @@ spec:
                 - topic
                 type: object
               loki:
-                description: loki, the flow store, client settings.
+                description: '`loki`, the flow store, client settings.'
                 properties:
                   batchSize:
                     default: 102400