Skip to content

Commit b499c43

Browse files
OlivierCazadeAmoghrdjotak
authored
Fixing np default deployment after upgrade (#2044)
* Fixing np default deployment after upgrade * Update config/crd/bases/flows.netobserv.io_flowcollectors.yaml Co-authored-by: Amogh Rameshappa Devapura <[email protected]> * Regenerating bundle * Put back text suggested during review --------- Co-authored-by: Amogh Rameshappa Devapura <[email protected]> Co-authored-by: Joel Takvorian <[email protected]>
1 parent fd14538 commit b499c43

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

api/flowcollector/v1beta2/flowcollector_types.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,15 @@ type FlowCollectorSpec struct {
8888

8989
// `networkPolicy` defines network policy settings for NetObserv components isolation.
9090
// +k8s:conversion-gen=false
91+
// +kubebuilder:default:={enable:true}
9192
NetworkPolicy NetworkPolicy `json:"networkPolicy,omitempty"`
9293
}
9394

9495
type NetworkPolicy struct {
95-
// Set `enable` to `true` to deploy network policies on the namespaces used by NetObserv (main and privileged). It is disabled by default.
96+
// Deploys network policies on the namespaces used by NetObserv (main and privileged).
9697
// These network policies better isolate the NetObserv components to prevent undesired connections to them.
9798
// This option is enabled by default, disable it to manually manage network policies
98-
// +kubebuilder:default:=true
99+
// +optional
99100
Enable *bool `json:"enable,omitempty"`
100101

101102
// `additionalNamespaces` contains additional namespaces allowed to connect to the NetObserv namespace.

bundle/manifests/flows.netobserv.io_flowcollectors.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4244,6 +4244,8 @@ spec:
42444244
and recreate the resource.
42454245
rule: self == oldSelf
42464246
networkPolicy:
4247+
default:
4248+
enable: true
42474249
description: '`networkPolicy` defines network policy settings for
42484250
NetObserv components isolation.'
42494251
properties:
@@ -4256,9 +4258,8 @@ spec:
42564258
type: string
42574259
type: array
42584260
enable:
4259-
default: true
42604261
description: |-
4261-
Set `enable` to `true` to deploy network policies on the namespaces used by NetObserv (main and privileged). It is disabled by default.
4262+
Deploys network policies on the namespaces used by NetObserv (main and privileged).
42624263
These network policies better isolate the NetObserv components to prevent undesired connections to them.
42634264
This option is enabled by default, disable it to manually manage network policies
42644265
type: boolean

bundle/manifests/netobserv-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ metadata:
253253
categories: Monitoring, Networking, Observability
254254
console.openshift.io/plugins: '["netobserv-plugin"]'
255255
containerImage: quay.io/netobserv/network-observability-operator:1.9.2-community
256-
createdAt: "2025-09-24T14:09:38Z"
256+
createdAt: "2025-09-30T17:05:14Z"
257257
description: Network flows collector and monitoring solution
258258
operatorframework.io/initialization-resource: '{"apiVersion":"flows.netobserv.io/v1beta2",
259259
"kind":"FlowCollector","metadata":{"name":"cluster"},"spec": {}}'

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3893,6 +3893,8 @@ spec:
38933893
- message: Namespace is immutable. If you need to change it, delete and recreate the resource.
38943894
rule: self == oldSelf
38953895
networkPolicy:
3896+
default:
3897+
enable: true
38963898
description: '`networkPolicy` defines network policy settings for NetObserv components isolation.'
38973899
properties:
38983900
additionalNamespaces:
@@ -3904,9 +3906,8 @@ spec:
39043906
type: string
39053907
type: array
39063908
enable:
3907-
default: true
39083909
description: |-
3909-
Set `enable` to `true` to deploy network policies on the namespaces used by NetObserv (main and privileged). It is disabled by default.
3910+
Deploys network policies on the namespaces used by NetObserv (main and privileged).
39103911
These network policies better isolate the NetObserv components to prevent undesired connections to them.
39113912
This option is enabled by default, disable it to manually manage network policies
39123913
type: boolean

docs/FlowCollector.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ Kafka can provide better scalability, resiliency, and high availability (for mor
155155
<td>object</td>
156156
<td>
157157
`networkPolicy` defines network policy settings for NetObserv components isolation.<br/>
158+
<br/>
159+
<i>Default</i>: map[enable:true]<br/>
158160
</td>
159161
<td>false</td>
160162
</tr><tr>
@@ -8347,11 +8349,9 @@ configuration, you can disable it and install your own instead.<br/>
83478349
<td><b>enable</b></td>
83488350
<td>boolean</td>
83498351
<td>
8350-
Set `enable` to `true` to deploy network policies on the namespaces used by NetObserv (main and privileged). It is disabled by default.
8352+
Deploys network policies on the namespaces used by NetObserv (main and privileged).
83518353
These network policies better isolate the NetObserv components to prevent undesired connections to them.
83528354
This option is enabled by default, disable it to manually manage network policies<br/>
8353-
<br/>
8354-
<i>Default</i>: true<br/>
83558355
</td>
83568356
<td>false</td>
83578357
</tr></tbody>

helm/crds/flows.netobserv.io_flowcollectors.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3897,6 +3897,8 @@ spec:
38973897
- message: Namespace is immutable. If you need to change it, delete and recreate the resource.
38983898
rule: self == oldSelf
38993899
networkPolicy:
3900+
default:
3901+
enable: true
39003902
description: '`networkPolicy` defines network policy settings for NetObserv components isolation.'
39013903
properties:
39023904
additionalNamespaces:
@@ -3908,9 +3910,8 @@ spec:
39083910
type: string
39093911
type: array
39103912
enable:
3911-
default: true
39123913
description: |-
3913-
Set `enable` to `true` to deploy network policies on the namespaces used by NetObserv (main and privileged). It is disabled by default.
3914+
Deploys network policies on the namespaces used by NetObserv (main and privileged).
39143915
These network policies better isolate the NetObserv components to prevent undesired connections to them.
39153916
This option is enabled by default, disable it to manually manage network policies
39163917
type: boolean

0 commit comments

Comments
 (0)