Skip to content

Commit

Permalink
Prepare release v1.6.0-community
Browse files Browse the repository at this point in the history
  • Loading branch information
jotak committed May 28, 2024
1 parent 6a9a966 commit acba911
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
BUNDLE_VERSION ?= 1.6.0-crc0
BUNDLE_VERSION ?= 1.6.0-community
# console plugin
export PLG_VERSION ?= v1.6.0-crc0
export PLG_VERSION ?= v1.6.0-community
# flowlogs-pipeline
export FLP_VERSION ?= v1.6.0-crc0
export FLP_VERSION ?= v1.6.0-community
# eBPF agent
export BPF_VERSION ?= v1.6.0-crc0
export BPF_VERSION ?= v1.6.0-community

# Allows building bundles in Mac replacing BSD 'sed' command by GNU-compatible 'gsed'
ifeq (,$(shell which gsed 2>/dev/null))
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-crc0"
version="1.6.0-community"
vv=v$version
test_branch=test-$vv

Expand Down Expand Up @@ -84,7 +84,7 @@ Click on "Publish release".
Before publishing, we should check that upgrading the operator from a previous version isn't broken. We can use `operator-sdk` for that:

```bash
previous=v1.0.4
previous=v1.0.5
bin/operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:$previous --timeout 5m
PORT_FWD=false make deploy-loki deploy-sample-cr
bin/operator-sdk run bundle-upgrade quay.io/netobserv/network-observability-operator-bundle:$vv --timeout 5m
Expand Down
26 changes: 13 additions & 13 deletions bundle/manifests/netobserv-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-crc0
containerImage: quay.io/netobserv/network-observability-operator:1.6.0-community
createdAt: ':created-at:'
description: Network flows collector and monitoring solution
operatorframework.io/initialization-resource: '{"apiVersion":"flows.netobserv.io/v1beta2",
Expand All @@ -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.0-crc0
name: netobserv-operator.v1.6.0-community
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -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.0-crc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-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.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/config/samples/flows_v1beta2_flowcollector.yaml).
To edit configuration in cluster, run:
Expand All @@ -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.0-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.0-community/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.
Expand All @@ -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.0-crc0/docs/Metrics.md).
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/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
Expand Down Expand Up @@ -1157,15 +1157,15 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_EBPF_AGENT
value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-crc0
value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-community
- name: RELATED_IMAGE_FLOWLOGS_PIPELINE
value: quay.io/netobserv/flowlogs-pipeline:v1.6.0-crc0
value: quay.io/netobserv/flowlogs-pipeline:v1.6.0-community
- name: RELATED_IMAGE_CONSOLE_PLUGIN
value: quay.io/netobserv/network-observability-console-plugin:v1.6.0-crc0
value: quay.io/netobserv/network-observability-console-plugin:v1.6.0-community
- name: DOWNSTREAM_DEPLOYMENT
value: "false"
- name: PROFILING_BIND_ADDRESS
image: quay.io/netobserv/network-observability-operator:1.6.0-crc0
image: quay.io/netobserv/network-observability-operator:1.6.0-community
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -1325,14 +1325,14 @@ spec:
name: Red Hat
url: https://www.redhat.com
relatedImages:
- image: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-crc0
- image: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-community
name: ebpf-agent
- image: quay.io/netobserv/flowlogs-pipeline:v1.6.0-crc0
- image: quay.io/netobserv/flowlogs-pipeline:v1.6.0-community
name: flowlogs-pipeline
- image: quay.io/netobserv/network-observability-console-plugin:v1.6.0-crc0
- image: quay.io/netobserv/network-observability-console-plugin:v1.6.0-community
name: console-plugin
replaces: netobserv-operator.v1.0.5
version: 1.6.0-crc0
version: 1.6.0-community
webhookdefinitions:
- admissionReviewVersions:
- v1beta1
Expand Down
6 changes: 3 additions & 3 deletions config/descriptions/ocp.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-crc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-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.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/config/samples/flows_v1beta2_flowcollector.yaml).

To edit configuration in cluster, run:

Expand All @@ -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.0-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.0-community/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.

Expand All @@ -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.0-crc0/docs/Metrics.md).
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/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
6 changes: 3 additions & 3 deletions config/descriptions/upstream.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-crc0/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-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.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/config/samples/flows_v1beta2_flowcollector.yaml).

To edit configuration in cluster, run:

Expand All @@ -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.0-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.0-community/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.

Expand All @@ -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.0-crc0/docs/Metrics.md).
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.0-community/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
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/netobserv/network-observability-operator
newTag: 1.6.0-crc0
newTag: 1.6.0-community
commonLabels:
app: netobserv-operator
6 changes: 3 additions & 3 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ spec:
- --profiling-bind-address=$(PROFILING_BIND_ADDRESS)
env:
- name: RELATED_IMAGE_EBPF_AGENT
value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-crc0
value: quay.io/netobserv/netobserv-ebpf-agent:v1.6.0-community
- name: RELATED_IMAGE_FLOWLOGS_PIPELINE
value: quay.io/netobserv/flowlogs-pipeline:v1.6.0-crc0
value: quay.io/netobserv/flowlogs-pipeline:v1.6.0-community
- name: RELATED_IMAGE_CONSOLE_PLUGIN
value: quay.io/netobserv/network-observability-console-plugin:v1.6.0-crc0
value: quay.io/netobserv/network-observability-console-plugin:v1.6.0-community
- name: DOWNSTREAM_DEPLOYMENT
value: "false"
- name: PROFILING_BIND_ADDRESS
Expand Down

0 comments on commit acba911

Please sign in to comment.