Manually bump to 1.36.0 (#3060)

* Manually bump to 1.36.0

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Use bundle:latest image for index Dockerfile

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Add get_bundle_for_version to catalog.sh

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Recreate index Dockerfile instead of search and replace via dynamic env var

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Update release process to follow a specific order and remove conflicting updates

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Remove rootdir from variable

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Instead of replacing image references, force use quay registry for testing

Replacing as done before doesn't respect per-component versioning and we
don't want to add the pre-requisite that every component is ready to bump
operator metadata.

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Try multiple mirrors

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Ensure ImageContentSourcePolicy

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Fix prefix check

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* skopeo retry-times

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Run make generated-files

Signed-off-by: Pierangelo Di Pilato <[email protected]>

* Remove channelv2 downgrade migration as it's only for 1.35

Signed-off-by: Pierangelo Di Pilato <[email protected]>

---------

Signed-off-by: Pierangelo Di Pilato <[email protected]>

Author: pierDipi

.github/ISSUE_TEMPLATE/release.md

@@ -23,12 +23,13 @@ assignees: ''
 ## Cutting the new release branch
 - [ ] Create a new branch from `main` with the pattern `release-x.xx`
 - [ ] [Approve CI setup for `release-1.X` branch in `openshift/release`](https://github.com/openshift/release/pulls/serverless-qe) and wait for the PR to be merged.
-- [ ] [Approve PRs created by GitHub actions bot in `serverless-operator`](https://github.com/openshift-knative/serverless-operator/pulls/app%2Fgithub-actions)
 - [ ] [Only for release-1.35+] [Revoke and recreate the token for the Konflux auto apply workflow](https://github.com/openshift-knative/hack/tree/main/cmd/konflux-apply#revoke-and-recreate-token)
 - [ ] [Only for release-1.35+] [Approve PRs created by `serverless-qe` bot in `hack`](https://github.com/openshift-knative/hack/pulls/serverless-qe)
   - [ ] wait for the PR to be merged
   - [ ] wait for the [Generate CI config workflow to succeed](https://github.com/openshift-knative/hack/actions/workflows/release-generate-ci.yaml?query=event%3Apush++)
   - [ ] [Approve Konflux-related PRs created by `serverless-qe`](https://github.com/pulls?q=is%3Aopen+is%3Apr+author%3Aserverless-qe+archived%3Afalse+%22Konflux%22) and wait for the PR to be merged.
+  - [ ] Wait for the PRs to be merged
+  - [ ] [Approve PRs created by GitHub actions bot in `serverless-operator`](https://github.com/openshift-knative/serverless-operator/pulls/app%2Fgithub-actions)
 - [ ] Verify that [`knative-istio-authz-chart`](https://github.com/openshift-knative/knative-istio-authz-chart/branches) has a branch with the same name as the `release-1.X` branch created previously in   serverless-operator
 - [ ] Verify that [`knative-istio-authz-chart`'s `Chart.yaml`](https://github.com/openshift-knative/knative-istio-authz-chart/blob/main/Chart.yaml) has `version` and `appVersion` set to the next version.
 

.github/workflows/validate.yaml

@@ -82,6 +82,7 @@ jobs:
         run: make generate-catalog
 
       - name: Regenerate override-snapshot
+        if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || ( github.event_name == 'push' && !contains(github.ref_name, 'dependabot/') )
         working-directory: ./src/github.com/${{ github.repository }}
         run: make generate-override-snapshot
 

Makefile

@@ -360,17 +360,14 @@ generate-dockerfiles: install-tool-generate
 # Generates all files that can be generated, includes release files, code generation
 # and updates vendoring.
 # Use CURRENT_VERSION_IMAGES="<branch>" if you need to override the defaulting to main
-generated-files: update-tekton-pipelines install-tools generate-dockerfiles release-files
+generated-files: install-tools generate-dockerfiles release-files
 	./hack/update-deps.sh
 	./hack/update-codegen.sh
 	(cd knative-operator && ./hack/update-manifests.sh)
 	(cd openshift-knative-operator && ./hack/update-manifests.sh)
 	(cd olm-catalog/serverless-operator && ./hack/update-manifests.sh)
 	./hack/update-deps.sh
 
-update-tekton-pipelines:
-	./hack/generate/update-pipelines.sh
-
 generated-files-release-next: release-files
 	# Re-generate CSV with release-next images
 	USE_RELEASE_NEXT=true ./hack/generate/csv.sh \

hack/generate/catalog.sh

@@ -151,7 +151,7 @@ EOF
 
 function upgrade_service_mesh_proxy_image() {
   sm_proxy_image=$(yq r olm-catalog/serverless-operator/project.yaml 'dependencies.service_mesh_proxy')
-  sm_proxy_image_stream=$(skopeo inspect --no-tags=true "docker://${sm_proxy_image}" | jq -r '.Labels.version')
+  sm_proxy_image_stream=$(skopeo inspect --retry-times=10 --no-tags=true "docker://${sm_proxy_image}" | jq -r '.Labels.version')
   sm_proxy_image_stream=${sm_proxy_image_stream%.*}
   sm_proxy_image=$(latest_konflux_image_sha "${sm_proxy_image}" "${sm_proxy_image_stream}")
   yq w --inplace olm-catalog/serverless-operator/project.yaml 'dependencies.service_mesh_proxy' "${sm_proxy_image}"
@@ -182,4 +182,7 @@ logger.info "Generating catalog"
 generate_catalog
 
 logger.info "Generating ImageContextSourcePolicy"
-create_image_content_source_policy "${INDEX_IMAGE}" "$registry_redhat_io" "$registry_quay" "olm-catalog/serverless-operator-index/image_content_source_policy.yaml"
+
+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"

hack/generate/csv.sh

@@ -4,6 +4,9 @@ set -Eeuo pipefail
 
 template="${1:?Provide template file as arg[1]}"
 target="${2:?Provide a target CSV file as arg[2]}"
+force_use_quay_images=${3:-"false"}
+
+export FORCE_USE_QUAY_IMAGES="${force_use_quay_images}"
 
 # shellcheck disable=SC1091,SC1090
 source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.bash"

hack/generate/dockerfile.sh

@@ -56,13 +56,6 @@ if [[ "$template" =~ index.Dockerfile ]]; then
     sed --in-place "/opm render/a registry.ci.openshift.org/knative/release-${current_version}:serverless-bundle \\\\" "$target"
   done
 
-  # Hacks. Should gradually go away with next versions.
-  # Workaround for https://issues.redhat.com/browse/SRVCOM-3207
-  # Use a manually built image for 1.32.0.
-  # TODO: Remove this when 1.32.0 is not included in index. This is a problem only for 1.32.0.
-  sed --in-place "s|registry.ci.openshift.org/knative/release-1.32.0:serverless-bundle|quay.io/openshift-knative/serverless-bundle:release-1.32.0|" "$target"
-  # Replace the old format for 1.31.0 and older.
-  sed --in-place "s|registry.ci.openshift.org/knative/release-1.31.0:serverless-bundle|registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle|" "$target"
 elif [[ "$template" =~ catalog.Dockerfile ]]; then
   while IFS=$'\n' read -r ocp_version; do
     values[OCP_VERSION]="${ocp_version}"

hack/generate/images-rekt.sh

@@ -9,12 +9,5 @@ target="${2:?Provide a target file as arg[2]}"
 source "$(dirname "${BASH_SOURCE[0]}")/../lib/images.bash"
 
 default_knative_eventing_images
-default_knative_eventing_istio_images
-default_knative_eventing_kafka_broker_images
-default_knative_backstage_plugins_images
-default_knative_serving_images
-default_knative_ingress_images
-default_knative_kn_plugin_func_images
-default_knative_client_images
 
 envsubst < "$template" > "$target"

hack/generate/override-snapshot.sh

@@ -116,7 +116,7 @@ spec:
 EOF
 
   index_image="${registry_quay}-fbc-${ocp_version}/serverless-index-${so_version}-fbc-${ocp_version}"
-  index_image_digest="$(skopeo inspect --no-tags docker://"${index_image}:latest" | jq -r .Digest)"
+  index_image_digest="$(skopeo inspect --retry-times=10 --no-tags docker://"${index_image}:latest" | jq -r .Digest)"
   add_component "${snapshot_file}" "serverless-index-${so_version}-fbc-${ocp_version}" "${index_image}@${index_image_digest}"
 
   append_hash_to_snapshot_name "${snapshot_file}"

hack/generate/update-pipelines.sh

@@ -23,5 +23,6 @@ create_namespaces "${SYSTEM_NAMESPACES[@]}"
 if [[ $INSTALL_CERTMANAGER == "true" ]]; then
   install_certmanager
 fi
+ensure_content_source_policy
 ensure_catalogsource_installed
 ensure_serverless_installed