Skip to content

Commit 450a81b

Browse files
authored
Merge pull request #99 from jkyros/bump-fbc-catalog-fix-missing-snapshot
AUTOSCALE-296: Bump FBC catalog to fix missing snapshot
2 parents 94aec96 + 1b78005 commit 450a81b

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

bundle-hack/regen-fbc-catalog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ for CATALOG_VERSION in catalogs/*; do
1212
# could be told to rewrite this as part of a nudge but there will come a point where we want to "archive" a pullspec and keep it in the bundle and we
1313
# won't want it to touch it after that, so until we figure out how we want to do that, this is what we get
1414
CURRENT_BUNDLE=$(cat bundle-hack/imagerefs/custom-metrics-autoscaler-operator-bundle.pullspec)
15-
sed -i "s|quay.io/redhat-user-workloads/cma-podauto-tenant/custom-metrics-autoscaler-operator/custom-metrics-autoscaler-operator-bundle@sha256.*|$CURRENT_BUNDLE|g" ${CATALOG_VERSION}/catalog-template.yaml
15+
sed -Ei "s|quay.io/redhat-user-workloads/cma-podauto-tenant/(custom-metrics-autoscaler-operator/)?custom-metrics-autoscaler-operator-bundle@sha256.*|$CURRENT_BUNDLE|g" ${CATALOG_VERSION}/catalog-template.yaml
1616
# This is basically "generate the catalog, and then rewrite the pullspecs to match their final resting place". You can't do it beforehand in the
1717
# template because render-template pulls all those images to check them to include them in the catalog (and the new ones won't be there yet because they
1818
# haven't shipped)

catalogs/fbc-stage/catalog-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ entries:
5757
schema: olm.bundle
5858
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:623280ae8997a354e5fb3275afaf0d2bb5d260b5bae0c7f56b858b7dc33a1e48
5959
schema: olm.bundle
60-
- image: quay.io/redhat-user-workloads/cma-podauto-tenant/custom-metrics-autoscaler-operator-bundle@sha256:fd01b287c3ddb4699c776b7cadeb095b7fa693649feb77b8675bebee2c667a5c
60+
- image: quay.io/redhat-user-workloads/cma-podauto-tenant/custom-metrics-autoscaler-operator-bundle@sha256:aeae57b2fc706b782a3e3905e5c1825fe831f96f5b1c9478e1f2b217307a892b
6161
schema: olm.bundle
6262
schema: olm.template.basic
6363

catalogs/fbc-stage/catalog/openshift-custom-metrics-autoscaler-operator/catalog.json

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

catalogs/fbc-stage/catalog/openshift-custom-metrics-autoscaler-operator/catalog.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4990,7 +4990,7 @@ relatedImages:
49904990
name: keda-operator
49914991
schema: olm.bundle
49924992
---
4993-
image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:fd01b287c3ddb4699c776b7cadeb095b7fa693649feb77b8675bebee2c667a5c
4993+
image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:aeae57b2fc706b782a3e3905e5c1825fe831f96f5b1c9478e1f2b217307a892b
49944994
name: custom-metrics-autoscaler.v2.17.2-1
49954995
package: openshift-custom-metrics-autoscaler-operator
49964996
properties:
@@ -5194,8 +5194,8 @@ properties:
51945194
categories: Cloud Provider
51955195
certified: "false"
51965196
console.openshift.io/operator-monitoring-default: "true"
5197-
containerImage: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:2cd89cb2f7578bbe433efcbddbdef997e3427ffb75a91832feec0618451ef6c6
5198-
createdAt: 13 Aug 2025, 01:56
5197+
containerImage: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:9a359ae6612d2f22fe983653418143873cb9939f83dca6f008ec3cb8f3d53990
5198+
createdAt: 20 Aug 2025, 21:31
51995199
description: Custom Metrics Autoscaler Operator, an event-driven autoscaler
52005200
based upon KEDA
52015201
features.operators.openshift.io/cnf: "false"
@@ -5582,14 +5582,14 @@ properties:
55825582
provider:
55835583
name: Red Hat
55845584
relatedImages:
5585-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:fd01b287c3ddb4699c776b7cadeb095b7fa693649feb77b8675bebee2c667a5c
5585+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:aeae57b2fc706b782a3e3905e5c1825fe831f96f5b1c9478e1f2b217307a892b
55865586
name: ""
5587-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-adapter-rhel9@sha256:5efb928872d9ed79f3e3a2be620f0e8970651c4f2802f3bb21249eee82ebf5ad
5587+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-adapter-rhel9@sha256:0c8ae9323f927346e168ba829f6c7679af6b2dd359c8d0a020dd0ae3954481ce
55885588
name: keda-adapter
5589-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-admission-webhooks-rhel9@sha256:8774eed4687f36dad5b7f3394b896d52db955da516870300b6c83ec102157d43
5589+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-admission-webhooks-rhel9@sha256:75631a21de057844e9ae45ae2496a22e16f3a32a6fd5f6cb5f90e173e3be2180
55905590
name: keda-webhooks
5591-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:2cd89cb2f7578bbe433efcbddbdef997e3427ffb75a91832feec0618451ef6c6
5591+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:9a359ae6612d2f22fe983653418143873cb9939f83dca6f008ec3cb8f3d53990
55925592
name: cma-operator
5593-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9@sha256:461d9a75d9ed286ea3bb1bb717eb23afa111530da123c9cde6f4379a36b7f7cb
5593+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9@sha256:ace9358fbd2d81a6e16bfa049c763ca16acf6cc2a59cdc0b6282e5e0dfc902cc
55945594
name: keda-operator
55955595
schema: olm.bundle

catalogs/fbc/catalog-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ entries:
5757
schema: olm.bundle
5858
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:623280ae8997a354e5fb3275afaf0d2bb5d260b5bae0c7f56b858b7dc33a1e48
5959
schema: olm.bundle
60-
- image: quay.io/redhat-user-workloads/cma-podauto-tenant/custom-metrics-autoscaler-operator-bundle@sha256:fd01b287c3ddb4699c776b7cadeb095b7fa693649feb77b8675bebee2c667a5c
60+
- image: quay.io/redhat-user-workloads/cma-podauto-tenant/custom-metrics-autoscaler-operator-bundle@sha256:aeae57b2fc706b782a3e3905e5c1825fe831f96f5b1c9478e1f2b217307a892b
6161
schema: olm.bundle
6262
schema: olm.template.basic
6363

catalogs/fbc/catalog/openshift-custom-metrics-autoscaler-operator/catalog.json

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

catalogs/fbc/catalog/openshift-custom-metrics-autoscaler-operator/catalog.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4990,7 +4990,7 @@ relatedImages:
49904990
name: keda-operator
49914991
schema: olm.bundle
49924992
---
4993-
image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:fd01b287c3ddb4699c776b7cadeb095b7fa693649feb77b8675bebee2c667a5c
4993+
image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:aeae57b2fc706b782a3e3905e5c1825fe831f96f5b1c9478e1f2b217307a892b
49944994
name: custom-metrics-autoscaler.v2.17.2-1
49954995
package: openshift-custom-metrics-autoscaler-operator
49964996
properties:
@@ -5194,8 +5194,8 @@ properties:
51945194
categories: Cloud Provider
51955195
certified: "false"
51965196
console.openshift.io/operator-monitoring-default: "true"
5197-
containerImage: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:2cd89cb2f7578bbe433efcbddbdef997e3427ffb75a91832feec0618451ef6c6
5198-
createdAt: 13 Aug 2025, 01:56
5197+
containerImage: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:9a359ae6612d2f22fe983653418143873cb9939f83dca6f008ec3cb8f3d53990
5198+
createdAt: 20 Aug 2025, 21:31
51995199
description: Custom Metrics Autoscaler Operator, an event-driven autoscaler
52005200
based upon KEDA
52015201
features.operators.openshift.io/cnf: "false"
@@ -5582,14 +5582,14 @@ properties:
55825582
provider:
55835583
name: Red Hat
55845584
relatedImages:
5585-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:fd01b287c3ddb4699c776b7cadeb095b7fa693649feb77b8675bebee2c667a5c
5585+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-operator-bundle@sha256:aeae57b2fc706b782a3e3905e5c1825fe831f96f5b1c9478e1f2b217307a892b
55865586
name: ""
5587-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-adapter-rhel9@sha256:5efb928872d9ed79f3e3a2be620f0e8970651c4f2802f3bb21249eee82ebf5ad
5587+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-adapter-rhel9@sha256:0c8ae9323f927346e168ba829f6c7679af6b2dd359c8d0a020dd0ae3954481ce
55885588
name: keda-adapter
5589-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-admission-webhooks-rhel9@sha256:8774eed4687f36dad5b7f3394b896d52db955da516870300b6c83ec102157d43
5589+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-admission-webhooks-rhel9@sha256:75631a21de057844e9ae45ae2496a22e16f3a32a6fd5f6cb5f90e173e3be2180
55905590
name: keda-webhooks
5591-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:2cd89cb2f7578bbe433efcbddbdef997e3427ffb75a91832feec0618451ef6c6
5591+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9-operator@sha256:9a359ae6612d2f22fe983653418143873cb9939f83dca6f008ec3cb8f3d53990
55925592
name: cma-operator
5593-
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9@sha256:461d9a75d9ed286ea3bb1bb717eb23afa111530da123c9cde6f4379a36b7f7cb
5593+
- image: registry.redhat.io/custom-metrics-autoscaler/custom-metrics-autoscaler-rhel9@sha256:ace9358fbd2d81a6e16bfa049c763ca16acf6cc2a59cdc0b6282e5e0dfc902cc
55945594
name: keda-operator
55955595
schema: olm.bundle

0 commit comments

Comments
 (0)