diff --git a/Makefile b/Makefile index 9e5878ea3..38acc62a0 100644 --- a/Makefile +++ b/Makefile @@ -23,14 +23,14 @@ IMAGE_ORG ?= $(USER) REPO ?= quay.io/$(IMAGE_ORG) # Component versions to use in bundle / release (do not use $VERSION for that) -PREVIOUS_VERSION ?= v1.0.3 -BUNDLE_VERSION ?= 1.0.4 +PREVIOUS_VERSION ?= v1.0.4 +BUNDLE_VERSION ?= 1.0.5-rc0 # console plugin -export PLG_VERSION ?= v0.1.11 +export PLG_VERSION ?= v0.1.12-rc0 # flowlogs-pipeline -export FLP_VERSION ?= v0.1.10 +export FLP_VERSION ?= v0.1.11-rc0 # eBPF agent -export BPF_VERSION ?= v0.3.2 +export BPF_VERSION ?= v0.3.3-rc0 # Allows building bundles in Mac replacing BSD 'sed' command by GNU-compatible 'gsed' ifeq (,$(shell which gsed 2>/dev/null)) diff --git a/RELEASE.md b/RELEASE.md index eac09a8dc..31d1aebe3 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -36,7 +36,7 @@ Edit the [Makefile](./Makefile) to update `PREVIOUS_VERSION`, `BUNDLE_VERSION`, make update-bundle # Set desired operator version - CAREFUL, no leading "v" here -version="1.0.4" +version="1.0.5-rc0" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index f7db1b69d..cbb31dbbb 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -406,7 +406,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring, Networking console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:1.0.4 + containerImage: quay.io/netobserv/network-observability-operator:1.0.5-rc0 createdAt: ':created-at:' description: Network flows collector and monitoring solution operatorframework.io/initialization-resource: '{"apiVersion":"flows.netobserv.io/v1beta2", @@ -421,7 +421,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: netobserv-operator.v1.0.4 + name: netobserv-operator.v1.0.5-rc0 namespace: placeholder spec: apiservicedefinitions: {} @@ -808,7 +808,7 @@ spec: ## Configuration - The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.0.4/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4/config/samples/flows_v1beta1_flowcollector.yaml). + The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/config/samples/flows_v1beta1_flowcollector.yaml). To edit configuration in cluster, run: @@ -826,7 +826,7 @@ spec: - Loki (`spec.loki`): configure here how to reach Loki. The default values match the Loki quick install paths mentioned above, but you might have to configure differently if you used another installation method. - - Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.0.4/docs/QuickFilters.md). + - Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/docs/QuickFilters.md). - Kafka (`spec.deploymentModel: KAFKA` and `spec.kafka`): when enabled, integrates the flow collection pipeline with Kafka, by splitting ingestion from transformation (kube enrichment, derived metrics, ...). Kafka can provide better scalability, resiliency and high availability ([view more details](https://www.redhat.com/en/topics/integration/what-is-apache-kafka)). Assumes Kafka is already deployed and a topic is created. @@ -1096,15 +1096,15 @@ spec: - /manager env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.3-rc0 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.10 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.11-rc0 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.11 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.12-rc0 - name: DOWNSTREAM_DEPLOYMENT value: "false" - name: PROFILING_BIND_ADDRESS - image: quay.io/netobserv/network-observability-operator:1.0.4 + image: quay.io/netobserv/network-observability-operator:1.0.5-rc0 imagePullPolicy: Always livenessProbe: httpGet: @@ -1264,14 +1264,14 @@ spec: name: Red Hat url: https://www.redhat.com relatedImages: - - image: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2 + - image: quay.io/netobserv/netobserv-ebpf-agent:v0.3.3-rc0 name: ebpf-agent - - image: quay.io/netobserv/flowlogs-pipeline:v0.1.10 + - image: quay.io/netobserv/flowlogs-pipeline:v0.1.11-rc0 name: flowlogs-pipeline - - image: quay.io/netobserv/network-observability-console-plugin:v0.1.11 + - image: quay.io/netobserv/network-observability-console-plugin:v0.1.12-rc0 name: console-plugin - replaces: netobserv-operator.v1.0.3 - version: 1.0.4 + replaces: netobserv-operator.v1.0.4 + version: 1.0.5-rc0 webhookdefinitions: - admissionReviewVersions: - v1alpha1 diff --git a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml index 849b7d8c6..ff04f3687 100644 --- a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml +++ b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml @@ -350,5 +350,5 @@ spec: provider: name: Red Hat url: https://www.redhat.com - replaces: netobserv-operator.v1.0.3 + replaces: netobserv-operator.v1.0.4 version: 0.0.0 diff --git a/config/descriptions/ocp.md b/config/descriptions/ocp.md index de89d0eba..475c07bf6 100644 --- a/config/descriptions/ocp.md +++ b/config/descriptions/ocp.md @@ -28,7 +28,7 @@ oc apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/252b ## Configuration -The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.0.4/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4/config/samples/flows_v1beta1_flowcollector.yaml). +The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/config/samples/flows_v1beta1_flowcollector.yaml). To edit configuration in cluster, run: @@ -44,7 +44,7 @@ A couple of settings deserve special attention: - Loki (`spec.loki`): configure here how to reach Loki. The default values match the Loki quick install paths mentioned above, but you might have to configure differently if you used another installation method. -- Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.0.4/docs/QuickFilters.md). +- Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/docs/QuickFilters.md). - Kafka (`spec.deploymentModel: KAFKA` and `spec.kafka`): when enabled, integrates the flow collection pipeline with Kafka, by splitting ingestion from transformation (kube enrichment, derived metrics, ...). Kafka can provide better scalability, resiliency and high availability ([view more details](https://www.redhat.com/en/topics/integration/what-is-apache-kafka)). Assumes Kafka is already deployed and a topic is created. diff --git a/config/descriptions/upstream.md b/config/descriptions/upstream.md index 647a1abb5..0458d5d37 100644 --- a/config/descriptions/upstream.md +++ b/config/descriptions/upstream.md @@ -32,7 +32,7 @@ kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents ## Configuration -The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.0.4/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4/config/samples/flows_v1beta1_flowcollector.yaml). +The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/config/samples/flows_v1beta1_flowcollector.yaml). To edit configuration in cluster, run: @@ -50,7 +50,7 @@ A couple of settings deserve special attention: - Loki (`spec.loki`): configure here how to reach Loki. The default values match the Loki quick install paths mentioned above, but you might have to configure differently if you used another installation method. -- Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.0.4/docs/QuickFilters.md). +- Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.0.5-rc0/docs/QuickFilters.md). - Kafka (`spec.deploymentModel: KAFKA` and `spec.kafka`): when enabled, integrates the flow collection pipeline with Kafka, by splitting ingestion from transformation (kube enrichment, derived metrics, ...). Kafka can provide better scalability, resiliency and high availability ([view more details](https://www.redhat.com/en/topics/integration/what-is-apache-kafka)). Assumes Kafka is already deployed and a topic is created. diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index f69dc045d..7af8b171d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -15,6 +15,6 @@ kind: Kustomization images: - name: controller newName: quay.io/netobserv/network-observability-operator - newTag: 1.0.4 + newTag: 1.0.5-rc0 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index ae4ee46a0..65421c668 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -31,11 +31,11 @@ spec: - --profiling-bind-address=$(PROFILING_BIND_ADDRESS) env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.3-rc0 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.10 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.11-rc0 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.11 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.12-rc0 - name: DOWNSTREAM_DEPLOYMENT value: "false" - name: PROFILING_BIND_ADDRESS diff --git a/config/samples/flowmetrics/az_aware_worloads_traffic.yaml b/config/samples/flowmetrics/az_aware_worloads_traffic.yaml new file mode 100644 index 000000000..4bfac10ab --- /dev/null +++ b/config/samples/flowmetrics/az_aware_worloads_traffic.yaml @@ -0,0 +1,18 @@ +apiVersion: flows.netobserv.io/v1alpha1 +kind: FlowMetric +metadata: + name: az-aware-workloads-traffic +spec: + metricName: az_aware_workloads_traffic_bytes_total + type: Counter + valueField: Bytes + direction: Ingress + labels: + - DstK8S_Namespace + - DstK8S_OwnerName + - DstK8S_OwnerType + - DstK8S_Zone + - SrcK8S_Namespace + - SrcK8S_OwnerName + - SrcK8S_OwnerType + - SrcK8S_Zone