Skip to content

Commit

Permalink
Prepare release v1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jotak committed Sep 11, 2023
1 parent 461e555 commit ba06996
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 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.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))
Expand Down
2 changes: 1 addition & 1 deletion 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.0.4-rc0"
version="1.0.4"
vv=v$version
test_branch=test-$vv

Expand Down
24 changes: 12 additions & 12 deletions bundle/manifests/netobserv-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: {}
Expand Down Expand Up @@ -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:
Expand All @@ -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.
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/descriptions/ocp.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

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

Expand Down
4 changes: 2 additions & 2 deletions config/descriptions/upstream.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

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

Expand Down
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.0.4-rc0
newTag: 1.0.4
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 @@ -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
Expand Down

0 comments on commit ba06996

Please sign in to comment.