diff --git a/Makefile b/Makefile index beb17a48c..2d25d5e5b 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.5 -BUNDLE_VERSION ?= 1.6.0-community +PREVIOUS_VERSION ?= v1.6.0-community +BUNDLE_VERSION ?= 1.6.1-community # console plugin -export PLG_VERSION ?= v1.6.0-community +export PLG_VERSION ?= v1.6.1-community # flowlogs-pipeline -export FLP_VERSION ?= v1.6.0-community +export FLP_VERSION ?= v1.6.1-community # eBPF agent -export BPF_VERSION ?= v1.6.0-community +export BPF_VERSION ?= v1.6.1-community # 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 257540641..07d02f0d9 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -11,7 +11,7 @@ To release them, a tag in the format "v1.6.0-community" or "v1.6.0-crc0" must be E.g: ```bash -version="v1.6.0-crc0" +version="v1.6.1-community" git tag -a "$version" -m "$version" git push upstream --tags ``` @@ -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.6.0-community" +version="1.6.1-community" vv=v$version test_branch=test-$vv @@ -84,7 +84,7 @@ Click on "Publish release". Before publishing, we should check that upgrading the operator from a previous version isn't broken. We can use `operator-sdk` for that: ```bash -previous=v1.0.5 +previous=v1.6.0-community bin/operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:$previous --timeout 5m PORT_FWD=false make deploy-loki deploy-sample-cr bin/operator-sdk run bundle-upgrade quay.io/netobserv/network-observability-operator-bundle:$vv --timeout 5m diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 0f61fa7f5..836946401 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -430,7 +430,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring, Networking console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:1.6.0-community + containerImage: quay.io/netobserv/network-observability-operator:1.6.1-community createdAt: ':created-at:' description: Network flows collector and monitoring solution operatorframework.io/initialization-resource: '{"apiVersion":"flows.netobserv.io/v1beta2", @@ -446,7 +446,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: netobserv-operator.v1.6.0-community + name: netobserv-operator.v1.6.1-community namespace: placeholder spec: apiservicedefinitions: {} @@ -872,7 +872,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.6.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/config/samples/flows_v1beta2_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.6.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/config/samples/flows_v1beta2_flowcollector.yaml). To edit configuration in cluster, run: @@ -888,7 +888,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. Make sure to disable it (`spec.loki.enable`) if you don't want to use Loki. - - 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.6.0-community/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.6.1-community/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. @@ -903,7 +903,7 @@ spec: This documentation includes: - An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots - - More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/docs/Metrics.md). + - More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/docs/Metrics.md). - A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning - A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section - An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section @@ -1157,15 +1157,15 @@ spec: - /manager env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-community + value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-community - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v1.6.0-community + value: quay.io/netobserv/flowlogs-pipeline:v1.6.1-community - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v1.6.0-community + value: quay.io/netobserv/network-observability-console-plugin:v1.6.1-community - name: DOWNSTREAM_DEPLOYMENT value: "false" - name: PROFILING_BIND_ADDRESS - image: quay.io/netobserv/network-observability-operator:1.6.0-community + image: quay.io/netobserv/network-observability-operator:1.6.1-community imagePullPolicy: Always livenessProbe: httpGet: @@ -1325,14 +1325,14 @@ spec: name: Red Hat url: https://www.redhat.com relatedImages: - - image: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-community + - image: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-community name: ebpf-agent - - image: quay.io/netobserv/flowlogs-pipeline:v1.6.0-community + - image: quay.io/netobserv/flowlogs-pipeline:v1.6.1-community name: flowlogs-pipeline - - image: quay.io/netobserv/network-observability-console-plugin:v1.6.0-community + - image: quay.io/netobserv/network-observability-console-plugin:v1.6.1-community name: console-plugin - replaces: netobserv-operator.v1.0.5 - version: 1.6.0-community + replaces: netobserv-operator.v1.6.0-community + version: 1.6.1-community webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml index 1c2d56adf..775919a31 100644 --- a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml +++ b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml @@ -353,5 +353,5 @@ spec: provider: name: Red Hat url: https://www.redhat.com - replaces: netobserv-operator.v1.0.5 + replaces: netobserv-operator.v1.6.0-community version: 0.0.0 diff --git a/config/descriptions/ocp.md b/config/descriptions/ocp.md index cc3dd4726..25fe797f2 100644 --- a/config/descriptions/ocp.md +++ b/config/descriptions/ocp.md @@ -38,7 +38,7 @@ In that case, you can still get the Prometheus metrics or export raw flows to a ## 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.6.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/config/samples/flows_v1beta2_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.6.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/config/samples/flows_v1beta2_flowcollector.yaml). To edit configuration in cluster, run: @@ -54,7 +54,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. Make sure to disable it (`spec.loki.enable`) if you don't want to use Loki. -- 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.6.0-community/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.6.1-community/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. @@ -69,7 +69,7 @@ Please refer to the documentation on GitHub for more information. This documentation includes: - An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots -- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/docs/Metrics.md). +- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/docs/Metrics.md). - A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning - A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section - An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section diff --git a/config/descriptions/upstream.md b/config/descriptions/upstream.md index dbeccf4c0..2f4045899 100644 --- a/config/descriptions/upstream.md +++ b/config/descriptions/upstream.md @@ -42,7 +42,7 @@ In that case, you can still get the Prometheus metrics or export raw flows to a ## 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.6.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/config/samples/flows_v1beta2_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.6.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/config/samples/flows_v1beta2_flowcollector.yaml). To edit configuration in cluster, run: @@ -58,7 +58,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. Make sure to disable it (`spec.loki.enable`) if you don't want to use Loki. -- 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.6.0-community/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.6.1-community/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. @@ -73,7 +73,7 @@ Please refer to the documentation on GitHub for more information. This documentation includes: - An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots -- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/docs/Metrics.md). +- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/docs/Metrics.md). - A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning - A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section - An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index bd1315553..8eae1f639 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.6.0-community + newTag: 1.6.1-community commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 5781a3f4c..b49bd6eab 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:v1.6.0-community + value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-community - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v1.6.0-community + value: quay.io/netobserv/flowlogs-pipeline:v1.6.1-community - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v1.6.0-community + value: quay.io/netobserv/network-observability-console-plugin:v1.6.1-community - name: DOWNSTREAM_DEPLOYMENT value: "false" - name: PROFILING_BIND_ADDRESS