Skip to content

Commit 34c6a47

Browse files
authored
Merge branch 'main' into helm-tls
2 parents 2a306f0 + 31b7455 commit 34c6a47

File tree

10 files changed

+38
-38
lines changed

10 files changed

+38
-38
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IMAGE_REGISTRY ?= quay.io
1515
REPO ?= $(IMAGE_REGISTRY)/$(IMAGE_ORG)
1616

1717
# Component versions to use in bundle / release (do not use $VERSION for that)
18-
BUNDLE_VERSION ?= 1.11.0-community
18+
BUNDLE_VERSION ?= 1.11.1-community
1919
# console plugin
2020
export PLG_VERSION ?= v${BUNDLE_VERSION}
2121
# flowlogs-pipeline

RELEASE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To release them, a tag in the format "v1.6.0-community" or "v1.6.0-crc0" must be
99
E.g:
1010

1111
```bash
12-
version="v1.11.0-community"
12+
version="v1.11.1-community"
1313
git tag -a "$version" -m "$version"
1414
git push upstream --tags
1515
```
@@ -24,7 +24,7 @@ We can then proceed with the operator. Edit the [Makefile](./Makefile) to update
2424
BUNDLE_SET_DATE=true make update-bundle
2525

2626
# Set desired operator version - CAREFUL, no leading "v" here
27-
version="1.11.0-community"
27+
version="1.11.1-community"
2828
vv=v$version
2929
test_branch=test-$vv
3030

@@ -146,15 +146,15 @@ From the operator repository:
146146
```bash
147147
helm package helm/
148148
index_path=/path/to/netobserv.github.io/static/helm
149-
mkdir -p $index_path/new && mv netobserv-operator-1.11.0.tgz $index_path/new && cd $index_path
149+
mkdir -p $index_path/new && mv netobserv-operator-1.11.1.tgz $index_path/new && cd $index_path
150150
helm repo index --merge index.yaml new/ --url https://netobserv.io/static/helm/
151151
mv new/* . && rmdir new
152152

153153
# Now, check there's nothing wrong in the generated files before commit (comparing last 2 versions)
154154
colordiff <(yq '.entries.netobserv-operator[1]' index.yaml) <(yq '.entries.netobserv-operator[0]' index.yaml)
155155

156-
git add netobserv-operator-1.11.0.tgz index.yaml
157-
git commit -m "Publish helm 1.11.0-community"
156+
git add netobserv-operator-1.11.1.tgz index.yaml
157+
git commit -m "Publish helm 1.11.1-community"
158158
git push upstream HEAD:main
159159
```
160160

bundle/manifests/netobserv-operator.clusterserviceversion.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ metadata:
9090
capabilities: Seamless Upgrades
9191
categories: Monitoring, Networking, Observability
9292
console.openshift.io/plugins: '["netobserv-plugin"]'
93-
containerImage: quay.io/netobserv/network-observability-operator:1.11.0-community
94-
createdAt: "2026-02-09T10:15:11Z"
93+
containerImage: quay.io/netobserv/network-observability-operator:1.11.1-community
94+
createdAt: "2026-02-23T11:16:14Z"
9595
description: Network flows collector and monitoring solution
9696
operatorframework.io/initialization-resource: '{"apiVersion":"flows.netobserv.io/v1beta2",
9797
"kind":"FlowCollector","metadata":{"name":"cluster"},"spec": {}}'
@@ -106,7 +106,7 @@ metadata:
106106
operatorframework.io/arch.ppc64le: supported
107107
operatorframework.io/arch.s390x: supported
108108
operatorframework.io/os.linux: supported
109-
name: netobserv-operator.v1.11.0-community
109+
name: netobserv-operator.v1.11.1-community
110110
namespace: placeholder
111111
spec:
112112
apiservicedefinitions: {}
@@ -618,7 +618,7 @@ spec:
618618
619619
## Configuration
620620
621-
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.11.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.11.0-community/config/samples/flows_v1beta2_flowcollector.yaml).
621+
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.11.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.11.1-community/config/samples/flows_v1beta2_flowcollector.yaml).
622622
623623
To edit configuration in cluster, run:
624624
@@ -671,7 +671,7 @@ spec:
671671
This documentation includes:
672672
673673
- An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots
674-
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.11.0-community/docs/Metrics.md).
674+
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.11.1-community/docs/Metrics.md).
675675
- A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning
676676
- A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section
677677
- An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section
@@ -998,13 +998,13 @@ spec:
998998
- /manager
999999
env:
10001000
- name: RELATED_IMAGE_EBPF_AGENT
1001-
value: quay.io/netobserv/netobserv-ebpf-agent:v1.11.0-community
1001+
value: quay.io/netobserv/netobserv-ebpf-agent:v1.11.1-community
10021002
- name: RELATED_IMAGE_FLOWLOGS_PIPELINE
1003-
value: quay.io/netobserv/flowlogs-pipeline:v1.11.0-community
1003+
value: quay.io/netobserv/flowlogs-pipeline:v1.11.1-community
10041004
- name: RELATED_IMAGE_CONSOLE_PLUGIN
1005-
value: quay.io/netobserv/network-observability-console-plugin:v1.11.0-community
1005+
value: quay.io/netobserv/network-observability-console-plugin:v1.11.1-community
10061006
- name: RELATED_IMAGE_CONSOLE_PLUGIN_COMPAT
1007-
value: quay.io/netobserv/network-observability-console-plugin:v1.11.0-community-pf4
1007+
value: quay.io/netobserv/network-observability-console-plugin:v1.11.1-community-pf4
10081008
- name: RELATED_IMAGE_DEMO_LOKI
10091009
value: grafana/loki:3.5.0
10101010
- name: DOWNSTREAM_DEPLOYMENT
@@ -1014,7 +1014,7 @@ spec:
10141014
valueFrom:
10151015
fieldRef:
10161016
fieldPath: metadata.namespace
1017-
image: quay.io/netobserv/network-observability-operator:1.11.0-community
1017+
image: quay.io/netobserv/network-observability-operator:1.11.1-community
10181018
imagePullPolicy: Always
10191019
livenessProbe:
10201020
httpGet:
@@ -1146,17 +1146,17 @@ spec:
11461146
name: Red Hat
11471147
url: https://www.redhat.com
11481148
relatedImages:
1149-
- image: quay.io/netobserv/netobserv-ebpf-agent:v1.11.0-community
1149+
- image: quay.io/netobserv/netobserv-ebpf-agent:v1.11.1-community
11501150
name: ebpf-agent
1151-
- image: quay.io/netobserv/flowlogs-pipeline:v1.11.0-community
1151+
- image: quay.io/netobserv/flowlogs-pipeline:v1.11.1-community
11521152
name: flowlogs-pipeline
1153-
- image: quay.io/netobserv/network-observability-console-plugin:v1.11.0-community
1153+
- image: quay.io/netobserv/network-observability-console-plugin:v1.11.1-community
11541154
name: console-plugin
1155-
- image: quay.io/netobserv/network-observability-console-plugin:v1.11.0-community-pf4
1155+
- image: quay.io/netobserv/network-observability-console-plugin:v1.11.1-community-pf4
11561156
name: console-plugin-compat
11571157
- image: grafana/loki:3.5.0
11581158
name: demo-loki
1159-
version: 1.11.0-community
1159+
version: 1.11.1-community
11601160
webhookdefinitions:
11611161
- admissionReviewVersions:
11621162
- v1

config/descriptions/ocp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ In that case, you still get the Prometheus metrics or export raw flows to a cust
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.11.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.11.0-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.11.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.11.1-community/config/samples/flows_v1beta2_flowcollector.yaml).
4646

4747
To edit configuration in cluster, run:
4848

@@ -95,7 +95,7 @@ Please refer to the documentation on GitHub for more information.
9595
This documentation includes:
9696

9797
- An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots
98-
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.11.0-community/docs/Metrics.md).
98+
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.11.1-community/docs/Metrics.md).
9999
- A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning
100100
- A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section
101101
- An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section

config/descriptions/upstream.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ In that case, you still get the Prometheus metrics or export raw flows to a cust
4646

4747
## Configuration
4848

49-
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.11.0-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.11.0-community/config/samples/flows_v1beta2_flowcollector.yaml).
49+
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.11.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.11.1-community/config/samples/flows_v1beta2_flowcollector.yaml).
5050

5151
To edit configuration in cluster, run:
5252

@@ -99,7 +99,7 @@ Please refer to the documentation on GitHub for more information.
9999
This documentation includes:
100100

101101
- An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots
102-
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.11.0-community/docs/Metrics.md).
102+
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.11.1-community/docs/Metrics.md).
103103
- A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning
104104
- A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section
105105
- 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
@@ -14,7 +14,7 @@ patches:
1414
images:
1515
- name: controller
1616
newName: quay.io/netobserv/network-observability-operator
17-
newTag: 1.11.0-community
17+
newTag: 1.11.1-community
1818
labels:
1919
- includeSelectors: true
2020
pairs:

config/manager/manager.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ spec:
3434
- --profiling-bind-address=$(PROFILING_BIND_ADDRESS)
3535
env:
3636
- name: RELATED_IMAGE_EBPF_AGENT
37-
value: quay.io/netobserv/netobserv-ebpf-agent:v1.11.0-community
37+
value: quay.io/netobserv/netobserv-ebpf-agent:v1.11.1-community
3838
- name: RELATED_IMAGE_FLOWLOGS_PIPELINE
39-
value: quay.io/netobserv/flowlogs-pipeline:v1.11.0-community
39+
value: quay.io/netobserv/flowlogs-pipeline:v1.11.1-community
4040
- name: RELATED_IMAGE_CONSOLE_PLUGIN
41-
value: quay.io/netobserv/network-observability-console-plugin:v1.11.0-community
41+
value: quay.io/netobserv/network-observability-console-plugin:v1.11.1-community
4242
- name: RELATED_IMAGE_CONSOLE_PLUGIN_COMPAT
43-
value: quay.io/netobserv/network-observability-console-plugin:v1.11.0-community-pf4
43+
value: quay.io/netobserv/network-observability-console-plugin:v1.11.1-community-pf4
4444
- name: RELATED_IMAGE_DEMO_LOKI
4545
value: grafana/loki:3.5.0
4646
- name: DOWNSTREAM_DEPLOYMENT

hack/nudging/container_digest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Operator
33
export OPERATOR_IMAGE_PULLSPEC='registry.redhat.io/network-observability/network-observability-rhel9-operator@sha256:a004c3b45bbec9a69e4444b116cece65c8d37c6281961a438faf233cc98fcc06'
44
# eBPF agent
5-
export EBPF_IMAGE_PULLSPEC='registry.redhat.io/network-observability/network-observability-ebpf-agent-rhel9@sha256:bc363cbb2e1ea5ec811856e84c9a9085c94178a41d218c2b96de2770e1a0fd73'
5+
export EBPF_IMAGE_PULLSPEC='registry.redhat.io/network-observability/network-observability-ebpf-agent-rhel9@sha256:20accc225f4a3fc9b7c530bc423db13de8446d1a29a89ad452b1828e34a1bdcf'
66
# Flowlogs-pipeline
77
export FLP_IMAGE_PULLSPEC='registry.redhat.io/network-observability/network-observability-flowlogs-pipeline-rhel9@sha256:6ba42566846ef45b3ac33a8ef361741533c00f3dc62bbfdb8dd59516c0bb2b38'
88
# Console plugin

helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.11.0
18+
version: 1.11.1
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: 1.11.0-community
24+
appVersion: 1.11.1-community
2525

2626
keywords:
2727
- netobserv

helm/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ certManager:
1010
# Deployment manifest values
1111
ebpfAgent:
1212
image: quay.io/netobserv/netobserv-ebpf-agent
13-
version: v1.11.0-community
13+
version: v1.11.1-community
1414
flowlogsPipeline:
1515
image: quay.io/netobserv/flowlogs-pipeline
16-
version: v1.11.0-community
16+
version: v1.11.1-community
1717
consolePlugin:
1818
image: quay.io/netobserv/network-observability-console-plugin
19-
version: v1.11.0-community
19+
version: v1.11.1-community
2020
standaloneConsole:
2121
enable: true
2222
image: quay.io/netobserv/network-observability-standalone-frontend
23-
version: v1.11.0-community
23+
version: v1.11.1-community
2424
operator:
2525
image: quay.io/netobserv/network-observability-operator
26-
version: 1.11.0-community
26+
version: 1.11.1-community
2727
# Node affinity configuration for the operator deployment
2828
nodeAffinity: {}
2929
# Example:

0 commit comments

Comments
 (0)