diff --git a/Makefile b/Makefile index 3b0fa631b..357eaed05 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.0.3 -BUNDLE_VERSION ?= 1.0.4-rc0 +BUNDLE_VERSION ?= 1.0.4 # console plugin -export PLG_VERSION ?= v0.1.11-rc0 +export PLG_VERSION ?= v0.1.11 # flowlogs-pipeline -export FLP_VERSION ?= v0.1.10-rc2 +export FLP_VERSION ?= v0.1.10 # eBPF agent -export BPF_VERSION ?= v0.3.2-rc0 +export BPF_VERSION ?= v0.3.2 # 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 0d228f9b5..eac09a8dc 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.0.4-rc0" +version="1.0.4" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index f3f9b07af..058536189 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -355,7 +355,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:1.0.4-rc0 + containerImage: quay.io/netobserv/network-observability-operator:1.0.4 createdAt: ':created-at:' description: Network flows collector and monitoring solution operatorframework.io/suggested-namespace: openshift-netobserv-operator @@ -368,7 +368,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: netobserv-operator.v1.0.4-rc0 + name: netobserv-operator.v1.0.4 namespace: placeholder spec: apiservicedefinitions: {} @@ -421,7 +421,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.4-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4-rc0/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.4/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4/config/samples/flows_v1beta1_flowcollector.yaml). To edit configuration in cluster, run: @@ -439,7 +439,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.4-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.4/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. @@ -691,14 +691,14 @@ spec: - /manager env: - name: RELATED_IMAGE_EBPF_AGENT - value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2-rc0 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.10-rc2 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.10 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.11-rc0 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.11 - name: DOWNSTREAM_DEPLOYMENT value: "false" - image: quay.io/netobserv/network-observability-operator:1.0.4-rc0 + image: quay.io/netobserv/network-observability-operator:1.0.4 imagePullPolicy: Always livenessProbe: httpGet: @@ -847,14 +847,14 @@ spec: name: Red Hat url: https://www.redhat.com relatedImages: - - image: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2-rc0 + - image: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2 name: ebpf-agent - - image: quay.io/netobserv/flowlogs-pipeline:v0.1.10-rc2 + - image: quay.io/netobserv/flowlogs-pipeline:v0.1.10 name: flowlogs-pipeline - - image: quay.io/netobserv/network-observability-console-plugin:v0.1.11-rc0 + - image: quay.io/netobserv/network-observability-console-plugin:v0.1.11 name: console-plugin replaces: netobserv-operator.v1.0.3 - version: 1.0.4-rc0 + version: 1.0.4 webhookdefinitions: - admissionReviewVersions: - v1alpha1 diff --git a/config/descriptions/ocp.md b/config/descriptions/ocp.md index 2526d9e8d..298ef4ff1 100644 --- a/config/descriptions/ocp.md +++ b/config/descriptions/ocp.md @@ -28,7 +28,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.4-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4-rc0/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.4/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4/config/samples/flows_v1beta1_flowcollector.yaml). To edit configuration in cluster, run: @@ -44,7 +44,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.4-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.4/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/descriptions/upstream.md b/config/descriptions/upstream.md index 270c26a8d..1c44dfd4c 100644 --- a/config/descriptions/upstream.md +++ b/config/descriptions/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.4-rc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4-rc0/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.4/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.4/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.4-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.4/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/manager/kustomization.yaml b/config/manager/kustomization.yaml index 86d8f2d4b..f69dc045d 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.4-rc0 + newTag: 1.0.4 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index dde9765e7..072e279d3 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.2-rc0 + value: quay.io/netobserv/netobserv-ebpf-agent:v0.3.2 - name: RELATED_IMAGE_FLOWLOGS_PIPELINE - value: quay.io/netobserv/flowlogs-pipeline:v0.1.10-rc2 + value: quay.io/netobserv/flowlogs-pipeline:v0.1.10 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.11-rc0 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.11 - name: DOWNSTREAM_DEPLOYMENT value: "false" image: controller:latest