PR feedback: introduce FlowCollectorSlice status

- Create a status on FlowCollectorSlice CRD that includes:
  - Number of configured subnets
  - Filter being applied
  - Ready condition
  - SubnetOverlap condition
- Add commented-out subnet config in FlowCollectorSlice sample
- Add new admin config in FlowCollector sample

Author: jotak

api/flowcollectorslice/v1alpha1/flowcollectorslice_types.go

@@ -33,6 +33,12 @@ type SubnetLabel struct {
 type FlowCollectorSliceStatus struct {
 	// `conditions` represent the latest available observations of an object's state
 	Conditions []metav1.Condition `json:"conditions"`
+	// Filter that is applied for flow collection
+	// +optional
+	FilterApplied string `json:"filterApplied"`
+	// Number of subnet labels configured
+	// +optional
+	SubnetLabelsConfigured int `json:"subnetLabelsConfigured"`
 }
 
 // +kubebuilder:object:root=true

api/flowcollectorslice/v1alpha1/groupversion_info.go

@@ -1,19 +1,3 @@
-/*
-Copyright 2021.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 // Package v1alpha1 contains API Schema definitions for the flows v1alpha1 API group
 // +kubebuilder:object:generate=true
 // +groupName=flows.netobserv.io

bundle/manifests/flows.netobserv.io_flowcollectorslices.yaml

@@ -132,6 +132,12 @@ spec:
                   - type
                   type: object
                 type: array
+              filterApplied:
+                description: Filter that is applied for flow collection
+                type: string
+              subnetLabelsConfigured:
+                description: Number of subnet labels configured
+                type: integer
             required:
             - conditions
             type: object

bundle/manifests/netobserv-operator.clusterserviceversion.yaml

@@ -247,6 +247,13 @@ metadata:
                   "cpu": "100m",
                   "memory": "100Mi"
                 }
+              },
+              "slicesConfig": {
+                "collectionMode": "AllowList",
+                "enable": false,
+                "namespacesAllowList": [
+                  "/openshift-.*|netobserv.*/"
+                ]
               }
             },
             "prometheus": {

config/crd/bases/flows.netobserv.io_flowcollectorslices.yaml

@@ -132,6 +132,12 @@ spec:
                   - type
                   type: object
                 type: array
+              filterApplied:
+                description: Filter that is applied for flow collection
+                type: string
+              subnetLabelsConfigured:
+                description: Number of subnet labels configured
+                type: integer
             required:
             - conditions
             type: object

config/samples/flows_v1alpha1_flowcollectorslice.yaml

@@ -4,3 +4,7 @@ metadata:
   name: flowcollectorslice-sample
 spec:
   sampling: 10
+  # subnetLabels:
+  # - name: my-database
+  #   cidrs:
+  #   - 1.2.3.4/24

config/samples/flows_v1beta2_flowcollector.yaml

@@ -121,6 +121,11 @@ spec:
       #       info: "5"
       #     groupBy: Namespace
       #     lowVolumeThreshold: "5"
+    slicesConfig:
+      enable: false
+      collectionMode: AllowList
+      namespacesAllowList:
+      - /openshift-.*|netobserv.*/
     # Kafka consumer stage configuration
     kafkaConsumerReplicas: 3
     kafkaConsumerAutoscaler: null

docs/FlowCollectorSlice.md

@@ -164,6 +164,20 @@ FlowCollectorSliceStatus defines the observed state of FlowCollectorSlice
           `conditions` represent the latest available observations of an object's state<br/>
         </td>
         <td>true</td>
+      </tr><tr>
+        <td><b>filterApplied</b></td>
+        <td>string</td>
+        <td>
+          Filter that is applied for flow collection<br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>subnetLabelsConfigured</b></td>
+        <td>integer</td>
+        <td>
+          Number of subnet labels configured<br/>
+        </td>
+        <td>false</td>
       </tr></tbody>
 </table>
 

helm/crds/flows.netobserv.io_flowcollectorslices.yaml

@@ -126,6 +126,12 @@ spec:
                       - type
                     type: object
                   type: array
+                filterApplied:
+                  description: Filter that is applied for flow collection
+                  type: string
+                subnetLabelsConfigured:
+                  description: Number of subnet labels configured
+                  type: integer
               required:
                 - conditions
               type: object

internal/controller/flp/flp_controller.go

@@ -11,6 +11,7 @@ import (
 	metricslatest "github.com/netobserv/network-observability-operator/api/flowmetrics/v1alpha1"
 	"github.com/netobserv/network-observability-operator/internal/controller/constants"
 	"github.com/netobserv/network-observability-operator/internal/controller/flp/fmstatus"
+	"github.com/netobserv/network-observability-operator/internal/controller/flp/slicesstatus"
 	"github.com/netobserv/network-observability-operator/internal/controller/reconcilers"
 	"github.com/netobserv/network-observability-operator/internal/pkg/helper"
 	"github.com/netobserv/network-observability-operator/internal/pkg/manager"
@@ -158,6 +159,8 @@ func (r *Reconciler) reconcile(ctx context.Context, clh *helper.Client, fc *flow
 		slices.SortFunc(fcSlices.Items, func(a, b sliceslatest.FlowCollectorSlice) int {
 			return strings.Compare(a.Name, b.Name)
 		})
+		slicesstatus.Reset(&fcSlices)
+		defer slicesstatus.Sync(ctx, r.Client, &fcSlices)
 	}
 
 	// Create sub-reconcilers