Skip to content
This repository was archived by the owner on Jun 12, 2025. It is now read-only.

Commit 71cf096

Browse files
authored
Merge pull request #492 from jenniferubah/konflux-doc-update
Konflux doc update
2 parents 01aa249 + e2289d1 commit 71cf096

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

docs/konflux/release_operator_with_konflux.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,21 @@ Capture the snapshot in an environment variable:
9595
snapshot=helm-operator-1-2-cf7qp
9696
```
9797

98-
* Ensure that the bundle's controller pullspec matches the one in the snapshot. The bundle's container image contains a label with the image pullspec of the controller used in the bundle. Use the following commands to extract the controler from the bundle of the snapshot `helm-operator-1-2-cf7qp`:
98+
* Ensure that the bundle's controller pullspec matches the one in the snapshot. The bundle's container image contains a label with the image pullspec of the controller used in the bundle. Use the following commands to extract the controller from the bundle of the snapshot `helm-operator-1-2-cf7qp`:
9999
```console
100100
bundle=$(oc get snapshot $snapshot -ojsonpath='{.spec.components[?(@.name=="'$orchestrator_operator_bundle'")].containerImage}')
101-
controllerInBundle=$(skopeo inspect docker://$bundle --format "{{.Labels.controller}}"|awk -F'@' '{print $2}')
102-
controllerInSnapshot=$(oc get snapshot $snapshot -ojsonpath='{.spec.components[?(@.name=="'$controller_rhel9_operator'")].containerImage}'|awk -F'@' '{print $2}')
103-
if [ -n "$controllerInBundle" ] && [ "$controllerInBundle" = "$controllerInSnapshot" ]; then echo "controller image pullspec matches";else echo "controller image pullspec does not match. This snapshot is not a good candidate for release";fi
101+
controllerInBundle=$(skopeo inspect docker://$bundle --format "{{.Labels.controller}}")
102+
controllerSHAInBundle=$(awk -F'@' '{print $2}' <<< "$controllerInBundle")
103+
controllerInSnapshot=$(oc get snapshot $snapshot -ojsonpath='{.spec.components[?(@.name=="'$controller_rhel9_operator'")].containerImage}')
104+
controllerSHAInSnapshot=$(awk -F'@' '{print $2}' <<< "$controllerInSnapshot")
105+
if [ -n "$controllerInBundle" ] && [ "$controllerSHAInBundle" = "$controllerSHAInSnapshot" ]; then echo "controller image pullspec matches";else echo "controller image pullspec does not match. This snapshot is not a good candidate for release";fi
106+
```
107+
108+
* Verify that the bundle and controller release label also matches. Run the following command to extract and compare the release label for the bundle and controller images.
109+
```console
110+
releaseLabelInBundle=$(skopeo inspect docker://$bundle --format "{{.Labels.release}}")
111+
releaseLabelInController=$(skopeo inspect docker://$controllerInSnapshot --format "{{.Labels.release}}")
112+
if [ -n "$controllerInBundle" ] && [ "$releaseLabelInBundle" = "$releaseLabelInController" ]; then echo "bundle and controller release label matches";else echo "bundle and controller release label does not match. This snapshot is not a good candidate for release";fi
104113
```
105114

106115
* Create a new Release manifest for staging
@@ -423,7 +432,7 @@ schema: olm.bundle
423432
fbc-v4-14-k3ksj True Merge pull request #93 from jordigilh/release/prod/1.2.0-rc11
424433
```
425434

426-
* Create a new Release manifest for staging
435+
* Create a new Release manifest for production
427436
```console
428437
snapshot=fbc-v4-14-k3ksj
429438

0 commit comments

Comments
 (0)