Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NETOBSERV-791 Better organize OLM form #425

Merged
merged 5 commits into from
Jan 25, 2024
Merged

NETOBSERV-791 Better organize OLM form #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9de378b
specDescriptors / statusDescriptors
jpinsonneau Sep 18, 2023
2178336
Reorganize some settings:
jotak Jan 23, 2024
fe9a8ee
Generate some specDescriptors from script
jotak Jan 23, 2024
22e2c55
Make FlowCollector required
jotak Jan 23, 2024
a16f6e3
fixed required CRD annotation
jotak Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,15 @@ bundle-prepare: OPSDK generate kustomize ## Generate bundle manifests and metada
bundle: bundle-prepare ## Generate final bundle files.
rm -r bundle/manifests
rm -r bundle/metadata
cp ./config/csv/bases/netobserv-operator.clusterserviceversion.yaml tmp-csv
hack/crd2csvSpecDesc.sh v1beta2
$(SED) -e 's/^/ /' config/descriptions/upstream.md > tmp-desc
$(KUSTOMIZE) build $(BUNDLE_CONFIG) \
| $(SED) -e 's~:container-image:~$(IMAGE)~' \
| $(SED) -e "/':full-description:'/r tmp-desc" \
| $(SED) -e "s/':full-description:'/|\-/" \
| $(OPSDK) generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
mv tmp-csv ./config/csv/bases/netobserv-operator.clusterserviceversion.yaml
rm tmp-desc
sh -c '\
VALIDATION_OUTPUT=$$($(OPSDK) bundle validate ./bundle --select-optional suite=operatorframework); \
Expand Down
6 changes: 3 additions & 3 deletions apis/flowcollector/v1beta1/flowcollector_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ type FlowCollectorEBPF struct {
// `logLevel` defines the log level for the NetObserv eBPF Agent
LogLevel string `json:"logLevel,omitempty"`

// Privileged mode for the eBPF Agent container. In general this setting can be ignored or set to `false`:
// in that case, the operator sets granular capabilities (BPF, PERFMON, NET_ADMIN, SYS_RESOURCE)
// to the container, to enable its correct operation.
// Privileged mode for the eBPF Agent container. When ignored or set to `false`, the operator sets
// granular capabilities (BPF, PERFMON, NET_ADMIN, SYS_RESOURCE) to the container.
// If for some reason these capabilities cannot be set, such as if an old kernel version not knowing CAP_BPF
// is in use, then you can turn on this mode for more global privileges.
// Some agent features require the privileged mode, such as packet drops tracking (see `features`).
// +optional
Privileged bool `json:"privileged,omitempty"`

Expand Down
6 changes: 3 additions & 3 deletions apis/flowcollector/v1beta2/flowcollector_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,11 @@ type FlowCollectorEBPF struct {
// `logLevel` defines the log level for the NetObserv eBPF Agent
LogLevel string `json:"logLevel,omitempty"`

// Privileged mode for the eBPF Agent container. In general this setting can be ignored or set to `false`:
// in that case, the operator sets granular capabilities (BPF, PERFMON, NET_ADMIN, SYS_RESOURCE)
// to the container, to enable its correct operation.
// Privileged mode for the eBPF Agent container. When ignored or set to `false`, the operator sets
// granular capabilities (BPF, PERFMON, NET_ADMIN, SYS_RESOURCE) to the container.
// If for some reason these capabilities cannot be set, such as if an old kernel version not knowing CAP_BPF
// is in use, then you can turn on this mode for more global privileges.
// Some agent features require the privileged mode, such as packet drops tracking (see `features`).
// +optional
Privileged bool `json:"privileged,omitempty"`

Expand Down
32 changes: 16 additions & 16 deletions bundle/manifests/flows.netobserv.io_flowcollectors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2608,14 +2608,14 @@ spec:
- panic
type: string
privileged:
description: 'Privileged mode for the eBPF Agent container.
In general this setting can be ignored or set to `false`:
in that case, the operator sets granular capabilities (BPF,
PERFMON, NET_ADMIN, SYS_RESOURCE) to the container, to enable
its correct operation. If for some reason these capabilities
cannot be set, such as if an old kernel version not knowing
CAP_BPF is in use, then you can turn on this mode for more
global privileges.'
description: Privileged mode for the eBPF Agent container.
When ignored or set to `false`, the operator sets granular
capabilities (BPF, PERFMON, NET_ADMIN, SYS_RESOURCE) to
the container. If for some reason these capabilities cannot
be set, such as if an old kernel version not knowing CAP_BPF
is in use, then you can turn on this mode for more global
privileges. Some agent features require the privileged mode,
such as packet drops tracking (see `features`).
type: boolean
resources:
default:
Expand Down Expand Up @@ -5293,14 +5293,14 @@ spec:
- panic
type: string
privileged:
description: 'Privileged mode for the eBPF Agent container.
In general this setting can be ignored or set to `false`:
in that case, the operator sets granular capabilities (BPF,
PERFMON, NET_ADMIN, SYS_RESOURCE) to the container, to enable
its correct operation. If for some reason these capabilities
cannot be set, such as if an old kernel version not knowing
CAP_BPF is in use, then you can turn on this mode for more
global privileges.'
description: Privileged mode for the eBPF Agent container.
When ignored or set to `false`, the operator sets granular
capabilities (BPF, PERFMON, NET_ADMIN, SYS_RESOURCE) to
the container. If for some reason these capabilities cannot
be set, such as if an old kernel version not knowing CAP_BPF
is in use, then you can turn on this mode for more global
privileges. Some agent features require the privileged mode,
such as packet drops tracking (see `features`).
type: boolean
resources:
default:
Expand Down
Loading
Loading