diff --git a/Makefile b/Makefile index e93ddec4b..c5123a20e 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.1 -BUNDLE_VERSION ?= 1.0.2 +PREVIOUS_VERSION ?= v1.0.2 +BUNDLE_VERSION ?= 1.0.3-rc0 # console plugin -export PLG_VERSION ?= v0.1.9 +export PLG_VERSION ?= v0.1.10-rc0 # flowlogs-pipeline -export FLP_VERSION ?= v0.1.8 +export FLP_VERSION ?= v0.1.9-rc2 # eBPF agent -export BPF_VERSION ?= v0.3.0 +export BPF_VERSION ?= v0.3.1-rc0 # 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 29798f09f..2a69b0e29 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,7 +4,7 @@ All components deployed by this operator can be released separatly, at their own pace. -Before releasing, it's a good opportunity to check for image upgrades: [go-toolset](https://catalog.redhat.com/software/containers/ubi9/go-toolset/61e5c00b4ec9945c18787690), [node.js](https://catalog.redhat.com/software/containers/ubi9/nodejs-16/61a60604c17162a20c1c6a2e) and [ubi9-minimal](https://catalog.redhat.com/software/containers/ubi9-minimal/61832888c0d15aff4912fe0d). +Before releasing, it's a good opportunity to check for image upgrades: Go, [node.js](https://catalog.redhat.com/software/containers/ubi9/nodejs-16/61a60604c17162a20c1c6a2e) and [ubi9-minimal](https://catalog.redhat.com/software/containers/ubi9-minimal/61832888c0d15aff4912fe0d). To release them, a tag in the format "v0.1.2" or "v0.1.2-rc0" must be set on the desired clean HEAD state (generally, up-to-date `main` branch), then pushed. It applies to [the console plugin](https://github.com/netobserv/network-observability-console-plugin/), [flowlogs-pipeline](https://github.com/netobserv/flowlogs-pipeline) and [netobserv-ebpf-agent](https://github.com/netobserv/netobserv-ebpf-agent). @@ -33,10 +33,10 @@ Edit the [Makefile](./Makefile) to update `PREVIOUS_VERSION`, `BUNDLE_VERSION`, ```bash -make bundle +make update-bundle # Set desired operator version - CAREFUL, no leading "v" here -version="1.0.2" +version="1.0.3-rc0" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 7f0a0c776..8c0ae4fd2 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -347,7 +347,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:1.0.2 + containerImage: quay.io/netobserv/network-observability-operator:1.0.3-rc0 createdAt: ':created-at:' description: Network flows collector and monitoring solution operatorframework.io/suggested-namespace: openshift-netobserv-operator @@ -359,7 +359,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/os.linux: supported - name: netobserv-operator.v1.0.2 + name: netobserv-operator.v1.0.3-rc0 namespace: placeholder spec: apiservicedefinitions: {} @@ -412,7 +412,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.2/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2/config/samples/flows_v1beta1_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.3-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.3-rc0/config/samples/flows_v1beta1_flowcollector.yaml). To edit configuration in cluster, run: @@ -430,7 +430,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.2/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.3-rc0/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. @@ -683,14 +683,14 @@ spec: - /manager env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.0 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.1-rc0 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.8 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.9-rc2 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.9 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.10-rc0 - name: DOWNSTREAM_DEPLOYMENT value: "false" - image: quay.io/netobserv/network-observability-operator:1.0.2 + image: quay.io/netobserv/network-observability-operator:1.0.3-rc0 imagePullPolicy: Always livenessProbe: httpGet: @@ -839,14 +839,14 @@ spec: name: Red Hat url: https://www.redhat.com relatedImages: - - image: quay.io/netobserv/netobserv-ebpf-agent:v0.3.0 + - image: quay.io/netobserv/netobserv-ebpf-agent:v0.3.1-rc0 name: ebpf-agent - - image: quay.io/netobserv/flowlogs-pipeline:v0.1.8 + - image: quay.io/netobserv/flowlogs-pipeline:v0.1.9-rc2 name: flowlogs-pipeline - - image: quay.io/netobserv/network-observability-console-plugin:v0.1.9 + - image: quay.io/netobserv/network-observability-console-plugin:v0.1.10-rc0 name: console-plugin - replaces: netobserv-operator.v1.0.1 - version: 1.0.2 + replaces: netobserv-operator.v1.0.2 + version: 1.0.3-rc0 webhookdefinitions: - admissionReviewVersions: - v1alpha1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index f7cb1c786..458f2fd65 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.0.2 + newTag: 1.0.3-rc0 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 624b7daed..14be21668 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -30,11 +30,11 @@ spec: - --downstream-deployment=$(DOWNSTREAM_DEPLOYMENT) env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.0 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.1-rc0 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.8 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.9-rc2 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.9 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.10-rc0 - name: DOWNSTREAM_DEPLOYMENT value: "false" image: controller:latest diff --git a/config/manifests/bases/description-ocp.md b/config/manifests/bases/description-ocp.md index 068ca9761..3de2e5699 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.2/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2/config/samples/flows_v1beta1_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.3-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.3-rc0/config/samples/flows_v1beta1_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.2/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.3-rc0/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 58fb4e2ba..544fb108e 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.2/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2/config/samples/flows_v1beta1_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.3-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.3-rc0/config/samples/flows_v1beta1_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.2/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.3-rc0/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/netobserv-operator.clusterserviceversion.yaml b/config/manifests/bases/netobserv-operator.clusterserviceversion.yaml index a55431d18..e27ae0138 100644 --- a/config/manifests/bases/netobserv-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/netobserv-operator.clusterserviceversion.yaml @@ -88,5 +88,5 @@ spec: provider: name: Red Hat url: https://www.redhat.com - replaces: netobserv-operator.v1.0.1 + replaces: netobserv-operator.v1.0.2 version: 0.0.0