Add mirrors in ImageContentSourcePolicy and ImageMirrorSet for next SO version too (#3762)

* Add mirrors in ImageContentSourcePolicy and ImageMirrorSet for next SO version too

* Run make generated-files

Author: creydr

hack/generate/catalog.sh

@@ -197,4 +197,4 @@ logger.info "Generating ImageContextSourcePolicy"
 
 default_serverless_operator_images
 # shellcheck disable=SC2154
-create_image_content_source_policy "${INDEX_IMAGE}" "$registry_redhat_io" "$registry_quay" "$registry_quay_previous" "olm-catalog/serverless-operator-index/image_content_source_policy.yaml" ".tekton/images-mirror-set.yaml"
+create_image_content_source_policy "${INDEX_IMAGE}" "$registry_redhat_io" "$registry_quay" "$registry_quay_previous" "$registry_quay_next" "olm-catalog/serverless-operator-index/image_content_source_policy.yaml" ".tekton/images-mirror-set.yaml"

hack/lib/catalogsource.bash

@@ -84,7 +84,7 @@ function install_catalogsource {
     # Use ImageContentSourcePolicy only with the FBC from Konflux as
     # updating machine config pools takes a while.
     # shellcheck disable=SC2154
-    create_image_content_source_policy "$index_image" "$registry_redhat_io" "$registry_quay" "$registry_quay_previous" "$tmpfile" "$idms_tmpfile"
+    create_image_content_source_policy "$index_image" "$registry_redhat_io" "$registry_quay" "$registry_quay_previous" "$registry_quay_next" "$tmpfile" "$idms_tmpfile"
     [ -n "$OPENSHIFT_CI" ] && cat "$tmpfile"
     if oc apply -f "$tmpfile"; then
       echo "Wait for machineconfigpool update to start"
@@ -125,8 +125,9 @@ function create_image_content_source_policy {
   registry_source="${2:?Pass source registry arg[2]}"
   registry_target="${3:?Pass target registry arg[3]}"
   registry_target_previous="${4:?Pass previous target registry arg[4]}"
-  image_content_source_policy_output_file="${5:?Pass output file arg[5]}"
-  image_digest_mirror_output_file="${6:?Pass image_digest_mirror_output_file arg[6]}"
+  registry_target_next="${5:?Pass next target registry arg[5]}"
+  image_content_source_policy_output_file="${6:?Pass output file arg[6]}"
+  image_digest_mirror_output_file="${7:?Pass image_digest_mirror_output_file arg[7]}"
 
   logger.info "Install ImageContentSourcePolicy"
   cat > "$image_content_source_policy_output_file" <<EOF
@@ -181,31 +182,32 @@ EOF
 
         local mirror1="${registry_target}/${target_img}"
         local mirror2="${registry_target_previous}/${target_img}"
+        local mirror3="${registry_target_next}/${target_img}"
 
-        add_repository_digest_mirrors "$image_content_source_policy_output_file" "${registry_source}/${img}" "${mirror1}" "${mirror2}"
-        add_image_digest_mirrors "$image_digest_mirror_output_file" "${registry_source}/${img}" "${mirror1}" "${mirror2}"
+        add_repository_digest_mirrors "$image_content_source_policy_output_file" "${registry_source}/${img}" "${mirror1}" "${mirror2}" "${mirror3}"
+        add_image_digest_mirrors "$image_digest_mirror_output_file" "${registry_source}/${img}" "${mirror1}" "${mirror2}" "${mirror3}"
       fi
     done <<< "$mirrors"
 }
 
 function add_repository_digest_mirrors {
-  echo "Add mirror image to '${1}' - $2 = $3, $4"
+  echo "Add mirror image to '${1}' - $2 = $3, $4, $5"
   cat << EOF | yq write --inplace --script - "$1"
 - command: update
   path: spec.repositoryDigestMirrors[+]
   value:
-    mirrors: [ "${3}", "${4}" ]
+    mirrors: [ "${3}", "${4}", "${5}" ]
     source: "${2}"
 EOF
 }
 
 function add_image_digest_mirrors {
-  echo "Add mirror image to '${1}' - $2 = $3, $4"
+  echo "Add mirror image to '${1}' - $2 = $3, $4, $5"
   cat << EOF | yq write --inplace --script - "$1"
 - command: update
   path: spec.imageDigestMirrors[+]
   value:
-    mirrors: [ "${3}", "${4}" ]
+    mirrors: [ "${3}", "${4}", "${5}" ]
     source: "${2}"
 EOF
 }

hack/lib/images.bash

@@ -18,8 +18,13 @@ quay_registry_app_version=${quay_registry_app_version%.*} # 136.0 -> 136
 quay_registry_app_version_previous=${PREVIOUS_VERSION/./} # 1.35.0 -> 135.0
 quay_registry_app_version_previous=${quay_registry_app_version_previous%.*} # 135.0 -> 135
 
+quay_registry_app_version_next=${CURRENT_VERSION/./} # 1.36.0 -> 136.0
+quay_registry_app_version_next=${quay_registry_app_version_next%.*} # 136.0 -> 136
+quay_registry_app_version_next="$((quay_registry_app_version_next + 1))" # 136 -> 137
+
 export registry_quay="${registry_prefix_quay}${quay_registry_app_version}"
 export registry_quay_previous="${registry_prefix_quay}${quay_registry_app_version_previous}"
+export registry_quay_next="${registry_prefix_quay}${quay_registry_app_version_next}"
 export registry_redhat_io="registry.redhat.io/openshift-serverless-1"
 
 export FORCE_USE_QUAY_IMAGES=${FORCE_USE_QUAY_IMAGES:-"false"}

olm-catalog/serverless-operator-index/Dockerfile

@@ -14,7 +14,7 @@ RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >>
 RUN /bin/opm render --skip-tls-verify -o yaml \
 quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle:1.35.0 \
 quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle:1.36.0 \
-      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-bundle@sha256:3ffc5452a37202785df30d54a9c792868f541f4b9e4971a68f5183c701abddab >> /configs/index.yaml
+      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-bundle@sha256:a081d2ca1c4825e3326e2be37e29deb84186c812d2877771a4e86580a9f5024c >> /configs/index.yaml
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe