From 3f872bf5f802b7095048070f0cdc5a849b178161 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Tue, 2 Jul 2024 10:10:56 +0200 Subject: [PATCH] Prepare release v1.6.1-crc1 --- Makefile | 4 ++-- RELEASE.md | 2 +- ...tobserv-operator.clusterserviceversion.yaml | 18 +++++++++--------- config/descriptions/ocp.md | 6 +++--- config/descriptions/upstream.md | 6 +++--- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 749aadd95..6fcce4215 100644 --- a/Makefile +++ b/Makefile @@ -24,13 +24,13 @@ REPO ?= quay.io/$(IMAGE_ORG) # Component versions to use in bundle / release (do not use $VERSION for that) PREVIOUS_VERSION ?= v1.6.0-community -BUNDLE_VERSION ?= 1.6.1-crc0 +BUNDLE_VERSION ?= 1.6.1-crc1 # console plugin export PLG_VERSION ?= v1.6.1-crc0 # flowlogs-pipeline export FLP_VERSION ?= v1.6.1-crc0 # eBPF agent -export BPF_VERSION ?= v1.6.1-crc0 +export BPF_VERSION ?= v1.6.1-crc1 # 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 2c6f545f1..2c728ecbc 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.6.1-crc0" +version="1.6.1-crc1" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index d3ca2ed28..58227eb49 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.1-crc0 + containerImage: quay.io/netobserv/network-observability-operator:1.6.1-crc1 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.1-crc0 + name: netobserv-operator.v1.6.1-crc1 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.1-crc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc0/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-crc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc1/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.1-crc0/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-crc1/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.1-crc0/docs/Metrics.md). + - More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc1/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,7 +1157,7 @@ spec: - /manager env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-crc0 + value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-crc1 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE value: quay.io/netobserv/flowlogs-pipeline:v1.6.1-crc0 - name: RELATED_IMAGE_CONSOLE_PLUGIN @@ -1165,7 +1165,7 @@ spec: - name: DOWNSTREAM_DEPLOYMENT value: "false" - name: PROFILING_BIND_ADDRESS - image: quay.io/netobserv/network-observability-operator:1.6.1-crc0 + image: quay.io/netobserv/network-observability-operator:1.6.1-crc1 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.1-crc0 + - image: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-crc1 name: ebpf-agent - image: quay.io/netobserv/flowlogs-pipeline:v1.6.1-crc0 name: flowlogs-pipeline - image: quay.io/netobserv/network-observability-console-plugin:v1.6.1-crc0 name: console-plugin replaces: netobserv-operator.v1.6.0-community - version: 1.6.1-crc0 + version: 1.6.1-crc1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/descriptions/ocp.md b/config/descriptions/ocp.md index 547357770..f659e49db 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.1-crc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc0/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-crc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc1/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.1-crc0/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-crc1/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.1-crc0/docs/Metrics.md). +- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc1/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 153f9c087..32ff4bf0c 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.1-crc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc0/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-crc1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc1/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.1-crc0/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-crc1/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.1-crc0/docs/Metrics.md). +- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.1-crc1/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 200d567c6..1fdfa9691 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.1-crc0 + newTag: 1.6.1-crc1 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index a910a80fa..ecba3b297 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -31,7 +31,7 @@ spec: - --profiling-bind-address=$(PROFILING_BIND_ADDRESS) env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-crc0 + value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.1-crc1 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE value: quay.io/netobserv/flowlogs-pipeline:v1.6.1-crc0 - name: RELATED_IMAGE_CONSOLE_PLUGIN