From 2de1e547ff878e2306730f720a60941a08d2aa0a Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Wed, 25 Jan 2023 19:15:02 +0100 Subject: [PATCH] Prepare release v1.0.1 --- Makefile | 8 +++--- RELEASE.md | 2 +- ...observ-operator.clusterserviceversion.yaml | 26 +++++++++---------- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 6 ++--- config/manifests/bases/description-ocp.md | 4 +-- .../manifests/bases/description-upstream.md | 4 +-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index ba77ea8d2..89ee8bb0e 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,14 @@ BUILD_SHA := $(shell git rev-parse --short HEAD) # Component versions to use in bundle / release (do not use $VERSION for that) PREVIOUS_VERSION ?= v0.2.2 -BUNDLE_VERSION ?= 1.0.1-rc0 +BUNDLE_VERSION ?= 1.0.1 OPERATOR_VERSION ?= $(BUNDLE_VERSION) # console plugin -export PLG_VERSION ?= v0.1.8-rc0 +export PLG_VERSION ?= v0.1.8 # flowlogs-pipeline -export FLP_VERSION ?= v0.1.7-rc1 +export FLP_VERSION ?= v0.1.7 # eBPF agent -export BPF_VERSION ?= v0.2.4-rc0 +export BPF_VERSION ?= v0.2.4 # Allows building bundles in Mac replacing BSD 'sed' command by GNU-compatible 'gsed' SED ?= sed diff --git a/RELEASE.md b/RELEASE.md index 81212c24c..624aa93cb 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="1.0.1-rc0" +version="1.0.1" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 7f71d8314..3204218a1 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:1.0.1-rc0 - createdAt: "2023-01-23T20:05:41Z" + containerImage: quay.io/netobserv/network-observability-operator:1.0.1 + createdAt: "2023-01-25T18:13:58Z" 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.v1.0.1-rc0 + name: netobserv-operator.v1.0.1 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/1.0.1-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.1-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/1.0.1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.1/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/1.0.1-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/1.0.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. @@ -477,12 +477,12 @@ spec: - /manager env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.4-rc0 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.4 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.7-rc1 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.7 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.8-rc0 - image: quay.io/netobserv/network-observability-operator:1.0.1-rc0 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.8 + image: quay.io/netobserv/network-observability-operator:1.0.1 imagePullPolicy: Always livenessProbe: httpGet: @@ -602,11 +602,11 @@ spec: name: Red Hat url: https://www.redhat.com relatedImages: - - image: quay.io/netobserv/netobserv-ebpf-agent:v0.2.4-rc0 + - image: quay.io/netobserv/netobserv-ebpf-agent:v0.2.4 name: ebpf-agent - - image: quay.io/netobserv/flowlogs-pipeline:v0.1.7-rc1 + - image: quay.io/netobserv/flowlogs-pipeline:v0.1.7 name: flowlogs-pipeline - - image: quay.io/netobserv/network-observability-console-plugin:v0.1.8-rc0 + - image: quay.io/netobserv/network-observability-console-plugin:v0.1.8 name: console-plugin replaces: netobserv-operator.v0.2.2 - version: 1.0.1-rc0 + version: 1.0.1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 432910b29..d9180bd0e 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: 1.0.1-rc0 + newTag: 1.0.1 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 6bcc965b0..38ffc176b 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.4-rc0 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.2.4 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.7-rc1 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.7 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.8-rc0 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.8 image: controller:latest name: manager imagePullPolicy: Always diff --git a/config/manifests/bases/description-ocp.md b/config/manifests/bases/description-ocp.md index da7e6aa43..4d16b93bb 100644 --- a/config/manifests/bases/description-ocp.md +++ b/config/manifests/bases/description-ocp.md @@ -32,7 +32,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.1-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.1-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/1.0.1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.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/1.0.1-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/1.0.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 4277897e4..f11f82627 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/1.0.1-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.1-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/1.0.1/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.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/1.0.1-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/1.0.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.