From 265b62fc5930f5b6f9dad3459f7faccd89110315 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Wed, 28 Feb 2024 10:01:13 -0400 Subject: [PATCH] chore: RHIDP-1105 switch annotations.yaml back to use fast channels; clean up comments (#246) * chore: RHIDP-1105 switch annotations.yaml back to use fast channels Signed-off-by: RHDH Build (rhdh-bot) * clean up comments Signed-off-by: RHDH Build (rhdh-bot) --------- Signed-off-by: RHDH Build (rhdh-bot) Co-authored-by: RHDH Build (rhdh-bot) --- .rhdh/bundle/metadata/annotations.yaml | 4 ++-- .rhdh/scripts/prepare-restricted-environment.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.rhdh/bundle/metadata/annotations.yaml b/.rhdh/bundle/metadata/annotations.yaml index 07f16f9d..2239efd4 100644 --- a/.rhdh/bundle/metadata/annotations.yaml +++ b/.rhdh/bundle/metadata/annotations.yaml @@ -3,5 +3,5 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: rhdh - operators.operatorframework.io.bundle.channel.default.v1: stable - operators.operatorframework.io.bundle.channels.v1: stable,stable-${CI_X_VERSION}.${CI_Y_VERSION} + operators.operatorframework.io.bundle.channel.default.v1: fast + operators.operatorframework.io.bundle.channels.v1: fast,fast-${CI_X_VERSION}.${CI_Y_VERSION} diff --git a/.rhdh/scripts/prepare-restricted-environment.sh b/.rhdh/scripts/prepare-restricted-environment.sh index bfaa8b60..fb19f0b6 100755 --- a/.rhdh/scripts/prepare-restricted-environment.sh +++ b/.rhdh/scripts/prepare-restricted-environment.sh @@ -34,7 +34,7 @@ done declare prod_operator_index="${prod_operator_index:?Must set --prod_operator_index: for OCP 4.12, use registry.redhat.io/redhat/redhat-operator-index:v4.12 or quay.io/rhdh/iib:latest-v4.14-x86_64}" declare prod_operator_package_name="rhdh" declare prod_operator_bundle_name="rhdh-operator" -declare prod_operator_version="${prod_operator_version:?Must set --prod_operator_version: for stable channel, use v1.1.0; for stable-1.1 channel, use v1.1.1}" # eg., v1.1.0 or v1.1.1 +declare prod_operator_version="${prod_operator_version:?Must set --prod_operator_version: for fast or fast-1.y channels, use v1.1.0, v1.1.1, etc.}" # Destination registry declare my_operator_index_image_name_and_tag=${prod_operator_package_name}-index:${prod_operator_version}