Skip to content

Commit 4fc8b84

Browse files
committed
Update y-stream and readme
1 parent 5be84f5 commit 4fc8b84

4 files changed

Lines changed: 15 additions & 3 deletions

File tree

Konflux.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ After a release, the following steps should be done:
166166
3. update the konflux components for these branches (see section "Redirecting branches" below - you must be connected to the konflux CI cluster)
167167
4. merge the nudging PRs that are generated after those changes
168168
5. update ystream and zstream in [netobserv-catalog](https://github.com/netobserv/netobserv-catalog):
169-
- updating the dependency graph (replace tags...) with the version just-released
169+
- update the dependency graph for the next version. For example, after releasing 1.12.1 and bumping repos to 1.12.2:
170+
- in `templates/z-stream.yaml`: add `v1.12.2 replaces v1.12.1` to the stable channel entries, pin the 1.12.1 bundle image to its released SHA (from `released.yaml`), and add a new `# 1.12.2` bundle entry pointing to `...bundle-zstream:latest`
171+
- update `templates/z-stream.Dockerfile-args` to `BUILDVERSION=1.12.2`
172+
- in `templates/y-stream.yaml`: update the `replaces` for the current y-stream entry to point to the just-released version (e.g. `v2.0.0 replaces v1.12.1` instead of `v1.12.0`), and add the released version's channel entry and bundle image with its SHA
173+
- for y-stream releases, also apply the same z-stream pattern to `y-stream.yaml` and `y-stream.Dockerfile-args`
170174
- only after step 4. is complete AND the bundle on-push jobs succeeded, regenerate all catalogs
171175
6. update the `ReleasePlanAdmission` objects in gitlab for next versions.
172176

templates/y-stream.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ entries:
5858
replaces: network-observability-operator.v1.11.1
5959
- name: network-observability-operator.v1.12.0
6060
replaces: network-observability-operator.v1.11.2
61-
- name: network-observability-operator.v2.0.0
61+
- name: network-observability-operator.v1.12.1
6262
replaces: network-observability-operator.v1.12.0
63+
- name: network-observability-operator.v2.0.0
64+
replaces: network-observability-operator.v1.12.1
6365
- schema: olm.channel
6466
package: netobserv-operator
6567
name: v1.0.x
@@ -119,5 +121,7 @@ entries:
119121
image: registry.redhat.io/network-observability/network-observability-operator-bundle@sha256:1144012ab4bb84b1f73804cb44a0f0febf2a30a5f41d5b301b9eccd125aa4c76
120122
- schema: olm.bundle # 1.12.0
121123
image: registry.redhat.io/network-observability/network-observability-operator-bundle@sha256:3334ff41c9a32e1adab61a312fbfe23a993e9e66eb67ebaad1333916823a8311
124+
- schema: olm.bundle # 1.12.1
125+
image: registry.redhat.io/network-observability/network-observability-operator-bundle@sha256:5c1346ca0e761ab5a931cf87fc317e09056019d28bc68c0356ebed32c5b8a49d
122126
- schema: olm.bundle # 2.0.0
123127
image: quay.io/redhat-user-workloads/ocp-network-observab-tenant/network-observability-operator-bundle-ystream:latest

templates/z-stream.Dockerfile-args

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BUILDVERSION=1.12.1
1+
BUILDVERSION=1.12.2

templates/z-stream.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ entries:
6060
replaces: network-observability-operator.v1.11.2
6161
- name: network-observability-operator.v1.12.1
6262
replaces: network-observability-operator.v1.12.0
63+
- name: network-observability-operator.v1.12.2
64+
replaces: network-observability-operator.v1.12.1
6365
- schema: olm.channel
6466
package: netobserv-operator
6567
name: v1.0.x
@@ -120,4 +122,6 @@ entries:
120122
- schema: olm.bundle # 1.12.0
121123
image: registry.redhat.io/network-observability/network-observability-operator-bundle@sha256:3334ff41c9a32e1adab61a312fbfe23a993e9e66eb67ebaad1333916823a8311
122124
- schema: olm.bundle # 1.12.1
125+
image: registry.redhat.io/network-observability/network-observability-operator-bundle@sha256:5c1346ca0e761ab5a931cf87fc317e09056019d28bc68c0356ebed32c5b8a49d
126+
- schema: olm.bundle # 1.12.2
123127
image: quay.io/redhat-user-workloads/ocp-network-observab-tenant/network-observability-operator-bundle-zstream:latest

0 commit comments

Comments
 (0)