diff --git a/Makefile b/Makefile index 763292066..b16b187de 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,10 @@ BUILD_SHA := $(shell git rev-parse --short HEAD) REPO ?= quay.io/netobserv # Component versions to use in bundle / release (do not use $VERSION for that) PREVIOUS_VERSION ?= v1.0.1 -BUNDLE_VERSION ?= 1.0.2-rc3 +BUNDLE_VERSION ?= 1.0.2 OPERATOR_VERSION ?= $(BUNDLE_VERSION) # console plugin -export PLG_VERSION ?= v0.1.9-rc2 +export PLG_VERSION ?= v0.1.9 # flowlogs-pipeline export FLP_VERSION ?= v0.1.8 # eBPF agent diff --git a/RELEASE.md b/RELEASE.md index e97e0998a..8087caa52 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.2-rc3" +version="1.0.2" vv=v$version test_branch=test-$vv diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index c9526c3cc..3e9fb5d3a 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -328,13 +328,13 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:1.0.2-rc3 - createdAt: "2023-02-21T08:09:31Z" + containerImage: quay.io/netobserv/network-observability-operator:1.0.2 + createdAt: "2023-02-21T08:20:07Z" 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.2-rc3 + name: netobserv-operator.v1.0.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -387,7 +387,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-rc3/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2-rc3/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.2/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2/config/samples/flows_v1alpha1_flowcollector.yaml). To edit configuration in cluster, run: @@ -405,7 +405,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-rc3/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.2/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. @@ -648,8 +648,8 @@ spec: - name: RELATED_IMAGE_FLOWLOGS_PIPELINE value: quay.io/netobserv/flowlogs-pipeline:v0.1.8 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.9-rc2 - image: quay.io/netobserv/network-observability-operator:1.0.2-rc3 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.9 + image: quay.io/netobserv/network-observability-operator:1.0.2 imagePullPolicy: Always livenessProbe: httpGet: @@ -786,10 +786,10 @@ spec: name: ebpf-agent - image: quay.io/netobserv/flowlogs-pipeline:v0.1.8 name: flowlogs-pipeline - - image: quay.io/netobserv/network-observability-console-plugin:v0.1.9-rc2 + - image: quay.io/netobserv/network-observability-console-plugin:v0.1.9 name: console-plugin replaces: netobserv-operator.v1.0.1 - version: 1.0.2-rc3 + version: 1.0.2 webhookdefinitions: - admissionReviewVersions: - v1alpha1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 72746eaba..f7cb1c786 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-rc3 + newTag: 1.0.2 commonLabels: app: netobserv-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 5480f4cb7..3b50dede3 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -33,7 +33,7 @@ spec: - name: RELATED_IMAGE_FLOWLOGS_PIPELINE value: quay.io/netobserv/flowlogs-pipeline:v0.1.8 - name: RELATED_IMAGE_CONSOLE_PLUGIN - value: quay.io/netobserv/network-observability-console-plugin:v0.1.9-rc2 + value: quay.io/netobserv/network-observability-console-plugin:v0.1.9 image: controller:latest name: manager imagePullPolicy: Always diff --git a/config/manifests/bases/description-ocp.md b/config/manifests/bases/description-ocp.md index ab6d0176d..9b530bf1d 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-rc3/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2-rc3/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.2/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2/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.2-rc3/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.2/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 3263df287..d5d556685 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-rc3/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2-rc3/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.2/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.0.2/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.2-rc3/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.2/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.