diff --git a/Makefile b/Makefile index 860cd9925..8d6fc6613 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ BUILD_SHA := $(shell git rev-parse --short HEAD) # Other component versions when building bundle / release PREVIOUS_VERSION ?= v0.2.1 -BUNDLE_VERSION ?= 0.2.2-rc0 +BUNDLE_VERSION ?= 0.2.2-rc1 # console plugin export PLG_VERSION ?= v0.1.7-rc0 # flowlogs-pipeline -export FLP_VERSION ?= v0.1.6-rc0 +export FLP_VERSION ?= v0.1.6-rc1 # eBPF agent export BPF_VERSION ?= v0.2.3-rc0 diff --git a/RELEASE.md b/RELEASE.md index 1265820d1..cd19d9ff4 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -36,7 +36,7 @@ Edit the [Makefile](./Makefile) to update `PREVIOUS_VERSION`, `BUNDLE_VERSION`, make bundle # Set desired operator version - CAREFUL, no leading "v" here -version="0.2.2-rc0" +version="0.2.2-rc1" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 890073a34..085f62f47 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -168,13 +168,13 @@ metadata: capabilities: Basic Install categories: Monitoring console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:0.2.2-rc0 - createdAt: "2022-12-16T14:10:14Z" + containerImage: quay.io/netobserv/network-observability-operator:0.2.2-rc1 + createdAt: "2022-12-19T13:44:42Z" description: Network flows collector and monitoring solution operators.operatorframework.io/builder: operator-sdk-v1.25.3 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/netobserv/network-observability-operator - name: netobserv-operator.v0.2.2-rc0 + name: netobserv-operator.v0.2.2-rc1 namespace: placeholder spec: apiservicedefinitions: {} @@ -221,7 +221,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.2-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.2-rc0/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.2-rc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.2-rc1/config/samples/flows_v1alpha1_flowcollector.yaml). To edit configuration in cluster, run: @@ -239,7 +239,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.2-rc0/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.2-rc1/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. @@ -458,10 +458,10 @@ spec: - name: RELATED_IMAGE_EBPF_AGENT value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.3-rc0 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.6-rc0 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.6-rc1 - name: RELATED_IMAGE_CONSOLE_PLUGIN value: quay.io/netobserv/network-observability-console-plugin:v0.1.7-rc0 - image: quay.io/netobserv/network-observability-operator:0.2.2-rc0 + image: quay.io/netobserv/network-observability-operator:0.2.2-rc1 imagePullPolicy: Always livenessProbe: httpGet: @@ -583,9 +583,9 @@ spec: relatedImages: - image: quay.io/netobserv/netobserv-ebpf-agent:v0.2.3-rc0 name: ebpf-agent - - image: quay.io/netobserv/flowlogs-pipeline:v0.1.6-rc0 + - image: quay.io/netobserv/flowlogs-pipeline:v0.1.6-rc1 name: flowlogs-pipeline - image: quay.io/netobserv/network-observability-console-plugin:v0.1.7-rc0 name: console-plugin replaces: netobserv-operator.v0.2.1 - version: 0.2.2-rc0 + version: 0.2.2-rc1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 0f5c34ee4..75aadc47a 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.2-rc0 + newTag: 0.2.2-rc1 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index d0a5c5d81..7d6652964 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -36,7 +36,7 @@ spec: - name: RELATED_IMAGE_EBPF_AGENT value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.3-rc0 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.6-rc0 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.6-rc1 - name: RELATED_IMAGE_CONSOLE_PLUGIN value: quay.io/netobserv/network-observability-console-plugin:v0.1.7-rc0 image: controller:latest diff --git a/config/manifests/bases/description-ocp.md b/config/manifests/bases/description-ocp.md index ed8b0e3cc..e7732fe75 100644 --- a/config/manifests/bases/description-ocp.md +++ b/config/manifests/bases/description-ocp.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/0.2.2-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.2-rc0/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.2-rc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.2-rc1/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.2-rc0/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.2-rc1/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 b8de951e2..452e63554 100644 --- a/config/manifests/bases/description-upstream.md +++ b/config/manifests/bases/description-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/0.2.2-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.2-rc0/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.2-rc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/0.2.2-rc1/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.2-rc0/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.2-rc1/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.