Skip to content

Commit ab3524e

Browse files
committed
Prepare release v1.8.2-community
1 parent a00a303 commit ab3524e

File tree

11 files changed

+73
-48
lines changed

11 files changed

+73
-48
lines changed

Makefile

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ IMAGE_ORG ?= $(USER)
1212
REPO ?= quay.io/$(IMAGE_ORG)
1313

1414
# Component versions to use in bundle / release (do not use $VERSION for that)
15-
PREVIOUS_VERSION ?= v1.8.0-community
15+
PREVIOUS_VERSION ?= v1.8.1-community
1616

17-
BUNDLE_VERSION ?= 1.8.1-community
17+
BUNDLE_VERSION ?= 1.8.2-community
1818
#File based catalog
19-
FBC_VERSION ?= 1.8.1-community
19+
FBC_VERSION ?= 1.8.2-community
2020
# console plugin
21-
export PLG_VERSION ?= v1.8.1-community
21+
export PLG_VERSION ?= v1.8.2-community
2222
# flowlogs-pipeline
23-
export FLP_VERSION ?= v1.8.1-community
23+
export FLP_VERSION ?= v1.8.2-community
2424
# eBPF agent
25-
export BPF_VERSION ?= v1.8.1-community
25+
export BPF_VERSION ?= v1.8.2-community
2626

2727
# Allows building bundles in Mac replacing BSD 'sed' command by GNU-compatible 'gsed'
2828
ifeq (,$(shell which gsed 2>/dev/null))
@@ -422,6 +422,7 @@ bundle: bundle-prepare ## Generate final bundle files.
422422
update-bundle: VERSION=$(BUNDLE_VERSION)
423423
update-bundle: IMAGE_ORG=netobserv
424424
update-bundle: bundle ## Prepare a clean bundle to be commited
425+
$(MAKE) helm-update
425426

426427
.PHONY: bundle-build
427428
bundle-build: ## Build the bundle image.
@@ -493,12 +494,15 @@ test-workflow: ## Run some tests on this Makefile and the github workflow
493494
.PHONY: related-release-notes
494495
related-release-notes: ## Grab release notes for related components (to be inserted in operator's release note upstream, cf RELEASE.md)
495496
echo -e "## Related components\n\n" > /tmp/related.md
496-
echo -e "### eBPF Agent\n\n" >> /tmp/related.md
497-
curl -s https://api.github.com/repos/netobserv/netobserv-ebpf-agent/releases/tags/$(BPF_VERSION) | jq -r .body | xargs -0 printf "%b" | sed -r "s/##/####/" >> /tmp/related.md
498-
echo -e "### Flowlogs-Pipeline\n\n" >> /tmp/related.md
499-
curl -s https://api.github.com/repos/netobserv/flowlogs-pipeline/releases/tags/$(FLP_VERSION) | jq -r .body | xargs -0 printf "%b" | sed -r "s/##/####/" >> /tmp/related.md
500-
echo -e "### Console Plugin\n\n" >> /tmp/related.md
501-
curl -s https://api.github.com/repos/netobserv/network-observability-console-plugin/releases/tags/$(PLG_VERSION) | jq -r .body | xargs -0 printf "%b" | sed -r "s/##/####/" >> /tmp/related.md
497+
echo -e "<details><summary><b>eBPF Agent</b></summary>\n\n" >> /tmp/related.md
498+
curl -s https://api.github.com/repos/netobserv/netobserv-ebpf-agent/releases/tags/$(BPF_VERSION) | jq -r .body | xargs -0 printf "%b" | sed -r "s/##/###/" >> /tmp/related.md
499+
echo -e "</details>\n" >> /tmp/related.md
500+
echo -e "<details><summary><b>Flowlogs-Pipeline</b></summary>\n\n" >> /tmp/related.md
501+
curl -s https://api.github.com/repos/netobserv/flowlogs-pipeline/releases/tags/$(FLP_VERSION) | jq -r .body | xargs -0 printf "%b" | sed -r "s/##/###/" >> /tmp/related.md
502+
echo -e "</details>\n" >> /tmp/related.md
503+
echo -e "<details><summary><b>Console Plugin</b></summary>\n\n" >> /tmp/related.md
504+
curl -s https://api.github.com/repos/netobserv/network-observability-console-plugin/releases/tags/$(PLG_VERSION) | jq -r .body | xargs -0 printf "%b" | sed -r "s/##/###/" >> /tmp/related.md
505+
echo -e "</details>\n" >> /tmp/related.md
502506
wl-copy < /tmp/related.md
503507
cat /tmp/related.md
504508
echo -e "\nText has been copied to the clipboard.\n"

RELEASE.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ To release them, a tag in the format "v1.6.0-community" or "v1.6.0-crc0" must be
1111
E.g:
1212

1313
```bash
14-
version="v1.8.1-community"
14+
version="v1.8.2-community"
1515
git tag -a "$version" -m "$version"
1616
git push upstream --tags
1717
```
@@ -25,6 +25,18 @@ When the last release candidate is accepted and the final release tag is pushed
2525

2626
Click the "Auto-generate release note" button.
2727

28+
If you think the "Dependencies" section is too long, you can surround it in a `<details>` block, to make it collapsed. E.g:
29+
30+
```yaml
31+
<details>
32+
<summary><b>Dependencies</b></summary>
33+
34+
* Bump [...] from [...] by @dependabot in...
35+
* ...
36+
</details>
37+
```
38+
39+
2840
### Operator
2941

3042
Once all sub-components are released (or have a release candidate), we can proceed with the operator.
@@ -35,7 +47,7 @@ Edit the [Makefile](./Makefile) to update `PREVIOUS_VERSION`, `BUNDLE_VERSION`,
3547
make update-bundle helm-update
3648

3749
# Set desired operator version - CAREFUL, no leading "v" here
38-
version="1.8.1-community"
50+
version="1.8.2-community"
3951
vv=v$version
4052
test_branch=test-$vv
4153

@@ -72,7 +84,18 @@ Grab related components release notes by running:
7284
make related-release-notes
7385
```
7486

75-
Then paste content following the auto-generated release note in GitHub.
87+
The script should fetch and copy the content in the clipboard. Paste it at the end of the auto-generated release note in GitHub.
88+
89+
If you think the "Dependencies" section is too long, you can surround it in a `<details>` block, to make it collapsed. E.g:
90+
91+
```yaml
92+
<details>
93+
<summary><b>Dependencies</b></summary>
94+
95+
* Bump github.com/netobserv/flowlogs-pipeline from [...] by @dependabot in...
96+
* ...
97+
</details>
98+
```
7699

77100
Check the "Create a discussion for this release" option, in category "Announcements".
78101

bundle/manifests/netobserv-operator.clusterserviceversion.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ metadata:
434434
capabilities: Seamless Upgrades
435435
categories: Monitoring, Networking
436436
console.openshift.io/plugins: '["netobserv-plugin"]'
437-
containerImage: quay.io/netobserv/network-observability-operator:1.8.1-community
437+
containerImage: quay.io/netobserv/network-observability-operator:1.8.2-community
438438
createdAt: ':created-at:'
439439
description: Network flows collector and monitoring solution
440440
operatorframework.io/initialization-resource: '{"apiVersion":"flows.netobserv.io/v1beta2",
@@ -450,7 +450,7 @@ metadata:
450450
operatorframework.io/arch.ppc64le: supported
451451
operatorframework.io/arch.s390x: supported
452452
operatorframework.io/os.linux: supported
453-
name: netobserv-operator.v1.8.1-community
453+
name: netobserv-operator.v1.8.2-community
454454
namespace: placeholder
455455
spec:
456456
apiservicedefinitions: {}
@@ -890,7 +890,7 @@ spec:
890890
891891
## Configuration
892892
893-
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.8.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.8.1-community/config/samples/flows_v1beta2_flowcollector.yaml).
893+
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.8.2-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/config/samples/flows_v1beta2_flowcollector.yaml).
894894
895895
To edit configuration in cluster, run:
896896
@@ -906,7 +906,7 @@ spec:
906906
907907
- 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.
908908
909-
- 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.8.1-community/docs/QuickFilters.md).
909+
- 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.8.2-community/docs/QuickFilters.md).
910910
911911
- 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.
912912
@@ -921,7 +921,7 @@ spec:
921921
This documentation includes:
922922
923923
- An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots
924-
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.8.1-community/docs/Metrics.md).
924+
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/docs/Metrics.md).
925925
- A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning
926926
- A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section
927927
- An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section
@@ -1213,15 +1213,15 @@ spec:
12131213
- /manager
12141214
env:
12151215
- name: RELATED_IMAGE_EBPF_AGENT
1216-
value: quay.io/netobserv/netobserv-ebpf-agent:v1.8.1-community
1216+
value: quay.io/netobserv/netobserv-ebpf-agent:v1.8.2-community
12171217
- name: RELATED_IMAGE_FLOWLOGS_PIPELINE
1218-
value: quay.io/netobserv/flowlogs-pipeline:v1.8.1-community
1218+
value: quay.io/netobserv/flowlogs-pipeline:v1.8.2-community
12191219
- name: RELATED_IMAGE_CONSOLE_PLUGIN
1220-
value: quay.io/netobserv/network-observability-console-plugin:v1.8.1-community
1220+
value: quay.io/netobserv/network-observability-console-plugin:v1.8.2-community
12211221
- name: DOWNSTREAM_DEPLOYMENT
12221222
value: "false"
12231223
- name: PROFILING_BIND_ADDRESS
1224-
image: quay.io/netobserv/network-observability-operator:1.8.1-community
1224+
image: quay.io/netobserv/network-observability-operator:1.8.2-community
12251225
imagePullPolicy: Always
12261226
livenessProbe:
12271227
httpGet:
@@ -1353,14 +1353,14 @@ spec:
13531353
name: Red Hat
13541354
url: https://www.redhat.com
13551355
relatedImages:
1356-
- image: quay.io/netobserv/netobserv-ebpf-agent:v1.8.1-community
1356+
- image: quay.io/netobserv/netobserv-ebpf-agent:v1.8.2-community
13571357
name: ebpf-agent
1358-
- image: quay.io/netobserv/flowlogs-pipeline:v1.8.1-community
1358+
- image: quay.io/netobserv/flowlogs-pipeline:v1.8.2-community
13591359
name: flowlogs-pipeline
1360-
- image: quay.io/netobserv/network-observability-console-plugin:v1.8.1-community
1360+
- image: quay.io/netobserv/network-observability-console-plugin:v1.8.2-community
13611361
name: console-plugin
1362-
replaces: netobserv-operator.v1.8.0-community
1363-
version: 1.8.1-community
1362+
replaces: netobserv-operator.v1.8.1-community
1363+
version: 1.8.2-community
13641364
webhookdefinitions:
13651365
- admissionReviewVersions:
13661366
- v1

config/csv/bases/netobserv-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,5 +353,5 @@ spec:
353353
provider:
354354
name: Red Hat
355355
url: https://www.redhat.com
356-
replaces: netobserv-operator.v1.8.0-community
356+
replaces: netobserv-operator.v1.8.1-community
357357
version: 0.0.0

config/descriptions/ocp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ In that case, you can still get the Prometheus metrics or export raw flows to a
3838

3939
## Configuration
4040

41-
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.8.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.8.1-community/config/samples/flows_v1beta2_flowcollector.yaml).
41+
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.8.2-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/config/samples/flows_v1beta2_flowcollector.yaml).
4242

4343
To edit configuration in cluster, run:
4444

@@ -54,7 +54,7 @@ A couple of settings deserve special attention:
5454

5555
- 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.
5656

57-
- 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.8.1-community/docs/QuickFilters.md).
57+
- 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.8.2-community/docs/QuickFilters.md).
5858

5959
- 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.
6060

@@ -69,7 +69,7 @@ Please refer to the documentation on GitHub for more information.
6969
This documentation includes:
7070

7171
- An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots
72-
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.8.1-community/docs/Metrics.md).
72+
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/docs/Metrics.md).
7373
- A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning
7474
- A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section
7575
- An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section

config/descriptions/upstream.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ In that case, you can still get the Prometheus metrics or export raw flows to a
4242

4343
## Configuration
4444

45-
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.8.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.8.1-community/config/samples/flows_v1beta2_flowcollector.yaml).
45+
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.8.2-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/config/samples/flows_v1beta2_flowcollector.yaml).
4646

4747
To edit configuration in cluster, run:
4848

@@ -58,7 +58,7 @@ A couple of settings deserve special attention:
5858

5959
- 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.
6060

61-
- 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.8.1-community/docs/QuickFilters.md).
61+
- 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.8.2-community/docs/QuickFilters.md).
6262

6363
- 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.
6464

@@ -73,7 +73,7 @@ Please refer to the documentation on GitHub for more information.
7373
This documentation includes:
7474

7575
- An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots
76-
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.8.1-community/docs/Metrics.md).
76+
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/docs/Metrics.md).
7777
- A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning
7878
- A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section
7979
- An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ kind: Kustomization
1616
images:
1717
- name: controller
1818
newName: quay.io/netobserv/network-observability-operator
19-
newTag: 1.8.1-community
19+
newTag: 1.8.2-community
2020
commonLabels:
2121
app: netobserv-operator

config/manager/manager.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ spec:
3131
- --profiling-bind-address=$(PROFILING_BIND_ADDRESS)
3232
env:
3333
- name: RELATED_IMAGE_EBPF_AGENT
34-
value: quay.io/netobserv/netobserv-ebpf-agent:v1.8.1-community
34+
value: quay.io/netobserv/netobserv-ebpf-agent:v1.8.2-community
3535
- name: RELATED_IMAGE_FLOWLOGS_PIPELINE
36-
value: quay.io/netobserv/flowlogs-pipeline:v1.8.1-community
36+
value: quay.io/netobserv/flowlogs-pipeline:v1.8.2-community
3737
- name: RELATED_IMAGE_CONSOLE_PLUGIN
38-
value: quay.io/netobserv/network-observability-console-plugin:v1.8.1-community
38+
value: quay.io/netobserv/network-observability-console-plugin:v1.8.2-community
3939
- name: DOWNSTREAM_DEPLOYMENT
4040
value: "false"
4141
- name: PROFILING_BIND_ADDRESS

0 commit comments

Comments
 (0)