diff --git a/Makefile b/Makefile index fe9ea67e7..5b51b676e 100644 --- a/Makefile +++ b/Makefile @@ -9,14 +9,14 @@ BUILD_DATE := $(shell date +%Y-%m-%d\ %H:%M) BUILD_SHA := $(shell git rev-parse --short HEAD) # Other component versions when building bundle / release -PREVIOUS_VERSION ?= v0.1.4 -BUNDLE_VERSION ?= 0.2.0 +PREVIOUS_VERSION ?= v0.2.0 +BUNDLE_VERSION ?= 0.2.1 # console plugin -export PLG_VERSION ?= v0.1.5 +export PLG_VERSION ?= v0.1.6 # flowlogs-pipeline -export FLP_VERSION ?= v0.1.4 +export FLP_VERSION ?= v0.1.5 # eBPF agent -export BPF_VERSION ?= v0.2.1 +export BPF_VERSION ?= v0.2.2 # Allows building bundles in Mac replacing BSD 'sed' command by GNU-compatible 'gsed' SED ?= sed diff --git a/RELEASE.md b/RELEASE.md index e1620a49d..f47136937 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -33,13 +33,13 @@ Once all sub-components are released (or have a release candidate), we can proce # Previous operator version previous="v0.2.0" # Set desired operator version - CAREFUL, no leading "v" here -version="0.2.1-rc1" +version="0.2.1" # Set console plugin released version -plgv="v0.1.6-rc1" +plgv="v0.1.6" # Set flowlogs-pipeline released version -flpv="v0.1.5-rc1" +flpv="v0.1.5" # Set ebpf-agent released version -bpfv="v0.2.2-rc1" +bpfv="v0.2.2" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 3ff2cee4e..bde94ed2f 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -187,13 +187,13 @@ metadata: capabilities: Basic Install categories: Monitoring console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:0.2.1-rc1 - createdAt: "2022-12-06T17:15:44Z" + containerImage: quay.io/netobserv/network-observability-operator:0.2.1 + createdAt: "2022-12-07T09:00:48Z" description: Network flows collector and monitoring solution operators.operatorframework.io/builder: operator-sdk-v1.25.2 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/netobserv/network-observability-operator - name: netobserv-operator.v0.2.1-rc1 + name: netobserv-operator.v0.2.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -226,8 +226,8 @@ spec: ``` kubectl create namespace netobserv - kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/3c42f1ff9c775dd0b746a92dc08c043f9a05f47f/examples/zero-click-loki/1-storage.yaml) -n netobserv - kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/3c42f1ff9c775dd0b746a92dc08c043f9a05f47f/examples/zero-click-loki/2-loki.yaml) -n netobserv + kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/252bb624cf0425a1b66f59ce68fb939f246ef77b/examples/zero-click-loki/1-storage.yaml) -n netobserv + kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/252bb624cf0425a1b66f59ce68fb939f246ef77b/examples/zero-click-loki/2-loki.yaml) -n netobserv ``` ### Kafka @@ -240,7 +240,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/0.2.1-rc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.1-rc1/config/samples/flows_v1alpha1_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/0.2.1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.1/config/samples/flows_v1alpha1_flowcollector.yaml). To edit configuration in cluster, run: @@ -258,7 +258,7 @@ spec: - Loki (`spec.loki`): configure here how to reach Loki. The default values match the Loki quick install paths mentioned above, but you may 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/0.2.1-rc1/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/0.2.1/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. @@ -475,12 +475,12 @@ spec: - /manager env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.2-rc1 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.2 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.5-rc1 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.5 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.6-rc1 - image: quay.io/netobserv/network-observability-operator:0.2.1-rc1 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.6 + image: quay.io/netobserv/network-observability-operator:0.2.1 imagePullPolicy: Always livenessProbe: httpGet: @@ -594,11 +594,11 @@ spec: name: Red Hat url: https://www.redhat.com relatedImages: - - image: quay.io/netobserv/netobserv-ebpf-agent:v0.2.2-rc1 + - image: quay.io/netobserv/netobserv-ebpf-agent:v0.2.2 name: ebpf-agent - - image: quay.io/netobserv/flowlogs-pipeline:v0.1.5-rc1 + - image: quay.io/netobserv/flowlogs-pipeline:v0.1.5 name: flowlogs-pipeline - - image: quay.io/netobserv/network-observability-console-plugin:v0.1.6-rc1 + - image: quay.io/netobserv/network-observability-console-plugin:v0.1.6 name: console-plugin replaces: netobserv-operator.v0.2.0 - version: 0.2.1-rc1 + version: 0.2.1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index e830ec0ab..d807ab37d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,6 +13,6 @@ kind: Kustomization images: - name: controller newName: quay.io/netobserv/network-observability-operator - newTag: 0.2.1-rc1 + newTag: 0.2.1 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 5522500ba..df5a9165e 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -34,11 +34,11 @@ spec: - --console-plugin-image=$(RELATED_IMAGE_CONSOLE_PLUGIN)" env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.2-rc1 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.2 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.5-rc1 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.5 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.6-rc1 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.6 image: controller:latest name: manager imagePullPolicy: Always diff --git a/config/manifests/bases/description-ocp.md b/config/manifests/bases/description-ocp.md index 4cd7f406d..411199c80 100644 --- a/config/manifests/bases/description-ocp.md +++ b/config/manifests/bases/description-ocp.md @@ -18,8 +18,8 @@ For a quick try that is not suitable for production and not scalable (it deploys ``` kubectl create namespace netobserv -kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/3c42f1ff9c775dd0b746a92dc08c043f9a05f47f/examples/zero-click-loki/1-storage.yaml) -n netobserv -kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/3c42f1ff9c775dd0b746a92dc08c043f9a05f47f/examples/zero-click-loki/2-loki.yaml) -n netobserv +kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/252bb624cf0425a1b66f59ce68fb939f246ef77b/examples/zero-click-loki/1-storage.yaml) -n netobserv +kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/252bb624cf0425a1b66f59ce68fb939f246ef77b/examples/zero-click-loki/2-loki.yaml) -n netobserv ``` ### Kafka @@ -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/0.2.1-rc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.1-rc1/config/samples/flows_v1alpha1_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/0.2.1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.1/config/samples/flows_v1alpha1_flowcollector.yaml). To edit configuration in cluster, run: @@ -48,7 +48,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 may 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/0.2.1-rc1/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/0.2.1/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/manifests/bases/description-upstream.md b/config/manifests/bases/description-upstream.md index cd103aa28..1f5ec8e6f 100644 --- a/config/manifests/bases/description-upstream.md +++ b/config/manifests/bases/description-upstream.md @@ -18,8 +18,8 @@ For a quick try that is not suitable for production and not scalable (it deploys ``` kubectl create namespace netobserv -kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/3c42f1ff9c775dd0b746a92dc08c043f9a05f47f/examples/zero-click-loki/1-storage.yaml) -n netobserv -kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/3c42f1ff9c775dd0b746a92dc08c043f9a05f47f/examples/zero-click-loki/2-loki.yaml) -n netobserv +kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/252bb624cf0425a1b66f59ce68fb939f246ef77b/examples/zero-click-loki/1-storage.yaml) -n netobserv +kubectl apply -f <(curl -L https://raw.githubusercontent.com/netobserv/documents/252bb624cf0425a1b66f59ce68fb939f246ef77b/examples/zero-click-loki/2-loki.yaml) -n netobserv ``` ### Kafka @@ -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/0.2.1-rc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.1-rc1/config/samples/flows_v1alpha1_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/0.2.1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.1/config/samples/flows_v1alpha1_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 may 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/0.2.1-rc1/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/0.2.1/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.