Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use correct FBC image when installing catalog source #2953

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Use correct FBC image when installing catalog source #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d369a36
Use correct FBC image when installing catalog source
mgencur Oct 17, 2024
aa3b383
Push bundle image only if entry was added
mgencur Oct 17, 2024
d20a634
Code changes
mgencur Oct 17, 2024
e2641f4
Regenerate 4.13
mgencur Oct 17, 2024
5c4dedd
Fix name
mgencur Oct 17, 2024
97ac4bc
Re-generate other catalogs
mgencur Oct 17, 2024
9553729
Use current OCP version for index image
mgencur Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions hack/generate/catalog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,25 +117,12 @@ EOF
mv "${catalog}" "${catalog_template}"

# If entry was added, add also the bundle
add_latest_bundle "${catalog_template}"
add_previous_bundle "${catalog_template}"
add_bundle "${catalog_template}" "$(get_bundle_for_version "${version}")"
fi
fi
rm -f "${catalog}"
}

function add_latest_bundle {
local catalog_template
catalog_template=${1?Pass catalog template path as arg[1]}
add_bundle "${catalog_template}" "${SERVERLESS_BUNDLE}"
}

function add_previous_bundle {
local catalog_template
catalog_template=${1?Pass catalog template path as arg[1]}
add_bundle "${catalog_template}" "${SERVERLESS_BUNDLE_PREVIOUS}"
}

function add_bundle {
local bundle catalog_template sha
catalog_template=${1?Pass catalog template path as arg[1]}
Expand Down
2 changes: 1 addition & 1 deletion hack/images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [[ $on_cluster_builds = true ]]; then
# image-registry.openshift-image-registry.svc:5000/openshift-marketplace/knative-openshift-ingress:latest
build_image "serverless-ingress" "${root_dir}" "serving/ingress/Dockerfile" || exit 1

logger.info 'Images build'
logger.info 'Image builds finished'

else
tmp_dockerfile=$(replace_images openshift-knative-operator/Dockerfile)
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/catalogsource.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

default_serverless_operator_images

index_image="${INDEX_IMAGE:-$SERVERLESS_INDEX}"
index_image="${INDEX_IMAGE}"

Check warning on line 24 in hack/lib/catalogsource.bash

View workflow job for this annotation

GitHub Actions / Lint 

[shellcheck] reported by reviewdog 🐶
Possible misspelling: INDEX_IMAGE may not be assigned. Did you mean index_image?

Raw Output:
./hack/lib/catalogsource.bash:24:16: info: Possible misspelling: INDEX_IMAGE may not be assigned. Did you mean index_image? (ShellCheck.SC2153)

# Build bundle and index images only when running in CI or when DOCKER_REPO_OVERRIDE is defined.
# Otherwise the latest nightly build will be used for CatalogSource.
Expand Down
58 changes: 45 additions & 13 deletions hack/lib/images.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,58 @@ ci_registry="${ci_registry_host}/openshift"

export CURRENT_VERSION_IMAGES=${CURRENT_VERSION_IMAGES:-"main"}
CURRENT_VERSION="$(metadata.get project.version)"
PREVIOUS_VERSION="$(metadata.get olm.replaces)"

quay_registry_app_version=${CURRENT_VERSION/./} # 1.34.0 -> 134.0
quay_registry_app_version=${quay_registry_app_version%.*} # 134.0 -> 134
quay_registry_app_version_previous=${PREVIOUS_VERSION/./}
quay_registry_app_version_previous=${quay_registry_app_version_previous%.*}
registry_prefix_quay="quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-"
registry_quay="${registry_prefix_quay}${quay_registry_app_version}"
registry_quay_previous="${registry_prefix_quay}${quay_registry_app_version_previous}"
registry_redhat_io="registry.redhat.io/openshift-serverless-1"


function default_serverless_operator_images() {
local ocp_version
local serverless_registry="${registry_quay}/serverless"
local serverless_registry_previous="${registry_quay_previous}/serverless"

export SERVERLESS_KNATIVE_OPERATOR=${SERVERLESS_KNATIVE_OPERATOR:-$(latest_registry_redhat_io_image_sha "${serverless_registry}-kn-operator:${CURRENT_VERSION_IMAGES}")}
export SERVERLESS_OPENSHIFT_KNATIVE_OPERATOR=${SERVERLESS_OPENSHIFT_KNATIVE_OPERATOR:-$(latest_registry_redhat_io_image_sha "${serverless_registry}-openshift-kn-operator:${CURRENT_VERSION_IMAGES}")}
export SERVERLESS_INGRESS=${SERVERLESS_INGRESS:-$(latest_registry_redhat_io_image_sha "${serverless_registry}-ingress:${CURRENT_VERSION_IMAGES}")}

export SERVERLESS_BUNDLE=${SERVERLESS_BUNDLE:-$(latest_konflux_image_sha "${serverless_registry}-bundle:${CURRENT_VERSION_IMAGES}")}
export SERVERLESS_BUNDLE=${SERVERLESS_BUNDLE:-$(get_bundle_for_version "${CURRENT_VERSION}")}
export DEFAULT_SERVERLESS_BUNDLE=${DEFAULT_SERVERLESS_BUNDLE:-$(get_bundle_for_version "${CURRENT_VERSION}")}

export SERVERLESS_BUNDLE_REDHAT_IO=${SERVERLESS_BUNDLE_REDHAT_IO:-$(latest_registry_redhat_io_image_sha "${serverless_registry}-bundle:${CURRENT_VERSION_IMAGES}")}

# TODO: Change this to the following line with 1.36
export SERVERLESS_BUNDLE_PREVIOUS=${SERVERLESS_BUNDLE_PREVIOUS:-$(image_with_sha "registry.ci.openshift.org/knative/serverless-bundle:release-${PREVIOUS_VERSION}")}
#export SERVERLESS_BUNDLE_PREVIOUS=${SERVERLESS_BUNDLE_PREVIOUS:-$(latest_konflux_image_sha "${serverless_registry_previous}-bundle:${CURRENT_VERSION_IMAGES}")}
export DEFAULT_SERVERLESS_BUNDLE=${DEFAULT_SERVERLESS_BUNDLE:-$(latest_konflux_image_sha "${serverless_registry}-bundle:${CURRENT_VERSION_IMAGES}")}
# Use the current OCP version if the cluster is running otherwise use the latest.
if oc get clusterversion &>/dev/null; then
ocp_version=$(oc get clusterversion version -o jsonpath='{.status.desired.version}')
else
ocp_version=$(metadata.get 'requirements.ocpVersion.list[-1]')
fi
ocp_version=${ocp_version/./} # 4.17 -> 417

export SERVERLESS_INDEX=${SERVERLESS_INDEX:-$(latest_konflux_image_sha "${serverless_registry}-index:${CURRENT_VERSION_IMAGES}")}
export INDEX_IMAGE=${INDEX_IMAGE:-$(latest_konflux_image_sha "${registry_quay}-fbc-${ocp_version}/serverless-index-${quay_registry_app_version}-fbc-${ocp_version}:${CURRENT_VERSION_IMAGES}")}
}

# Bundle image is specific as we need to pull older versions for including in the catalog.
function get_bundle_for_version() {
local version app_version bundle
version=${1:?"Provide version for Bundle image"}

app_version=${version/./} # 1.34.0 -> 134.0
app_version=${app_version%.*} # 134.0 -> 134

bundle="${registry_prefix_quay}${app_version}/serverless-bundle"

image=$(image_with_sha "${bundle}:latest")
# As a backup, try also CI registry. This it temporary until the previous version gets to Konflux.
if [[ "${image}" == "" ]]; then
image=$(image_with_sha "registry.ci.openshift.org/knative/serverless-bundle:release-${version}")
fi

if [[ "${image}" == "" ]]; then
exit 1
fi

echo "$image"
}

function knative_serving_images_release() {
Expand Down Expand Up @@ -224,6 +247,11 @@ function latest_registry_redhat_io_image_sha() {
image_without_tag=${image_without_tag%@*} # Remove sha, if any

image=$(image_with_sha "${image_without_tag}:latest")

if [ "${image}" = "" ]; then
exit 1
fi

digest="${image##*@}" # Get only sha

image_name=${image_without_tag##*/} # Get image name after last slash
Expand All @@ -239,6 +267,10 @@ function latest_konflux_image_sha() {

image=$(image_with_sha "${image_without_tag}:latest")

if [ "${image}" = "" ]; then
exit 1
fi

echo "${image}"
}

Expand All @@ -247,7 +279,7 @@ function image_with_sha {

digest=$(skopeo inspect --no-tags=true "docker://${image}" | jq -r '.Digest')
if [ "${digest}" = "" ]; then
exit 1
echo ""
fi

image_without_tag=${image%:*} # Remove tag, if any
Expand Down
70 changes: 61 additions & 9 deletions olm-catalog/serverless-operator-index/v4.13/catalog-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ entries:
- name: serverless-operator.v1.33.0
replaces: serverless-operator.v1.32.0
skipRange: '>=1.32.0 <1.33.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
- name: serverless-operator.v1.34.0
replaces: serverless-operator.v1.33.0
skipRange: '>=1.33.0 <1.34.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
name: stable
package: serverless-operator
schema: olm.channel
Expand Down Expand Up @@ -290,6 +290,58 @@ entries:
name: stable-1.33
package: serverless-operator
schema: olm.channel
- entries:
- name: serverless-operator.v1.20.0
replaces: serverless-operator.v1.19.0
skipRange: '>=1.19.0 <1.20.0'
- name: serverless-operator.v1.21.0
replaces: serverless-operator.v1.20.0
skipRange: '>=1.20.0 <1.21.0'
- name: serverless-operator.v1.22.0
replaces: serverless-operator.v1.21.0
skipRange: '>=1.21.0 <1.22.0'
- name: serverless-operator.v1.23.0
replaces: serverless-operator.v1.22.0
skipRange: '>=1.22.0 <1.23.0'
- name: serverless-operator.v1.24.0
replaces: serverless-operator.v1.23.0
skipRange: '>=1.23.0 <1.24.0'
- name: serverless-operator.v1.25.0
replaces: serverless-operator.v1.24.0
skipRange: '>=1.24.0 <1.25.0'
- name: serverless-operator.v1.26.0
replaces: serverless-operator.v1.25.0
skipRange: '>=1.25.0 <1.26.0'
- name: serverless-operator.v1.27.0
replaces: serverless-operator.v1.26.0
skipRange: '>=1.26.0 <1.27.0'
- name: serverless-operator.v1.27.1
replaces: serverless-operator.v1.27.0
skipRange: '>=1.26.0 <1.27.1'
- name: serverless-operator.v1.28.0
replaces: serverless-operator.v1.27.1
skipRange: '>=1.27.0 <1.28.0'
- name: serverless-operator.v1.29.0
replaces: serverless-operator.v1.28.0
skipRange: '>=1.28.0 <1.29.0'
- name: serverless-operator.v1.30.0
replaces: serverless-operator.v1.29.0
skipRange: '>=1.29.0 <1.30.0'
- name: serverless-operator.v1.31.0
replaces: serverless-operator.v1.30.0
skipRange: '>=1.30.0 <1.31.0'
- name: serverless-operator.v1.32.0
replaces: serverless-operator.v1.31.0
skipRange: '>=1.31.0 <1.32.0'
- name: serverless-operator.v1.33.0
replaces: serverless-operator.v1.32.0
skipRange: '>=1.32.0 <1.33.0'
- name: serverless-operator.v1.34.0
replaces: serverless-operator.v1.33.0
skipRange: '>=1.33.0 <1.34.0'
name: stable-1.34
package: serverless-operator
schema: olm.channel
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:003a5c5c3682db69aa57da4c05ed3ccbaf94fb80a4972c8ddcf91eb3d5e299b9
schema: olm.bundle
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:1905984e13c9d165aad06f954904fc33d3f3a6e2f0041f98bc5840d05a87abaf
Expand Down Expand Up @@ -330,10 +382,10 @@ entries:
schema: olm.bundle
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:d96f2a6e9bdd2540c5c7b0ffe6a8e610b43ba227420892586a46fbdb9a3caef3
schema: olm.bundle
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:82b9bfb8b83701db1a9b891d1ffc1e782d4b0f971fc9a53525942845c2602934
schema: olm.bundle
- schema: olm.bundle
image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle@sha256:62d1451f5c944c6fbb6ffaade5e210b5d85f0caffe56a527deff480c24cc8aeb
- schema: olm.bundle
image: registry.ci.openshift.org/knative/serverless-bundle@sha256:430c7aa5a5c4780fd4a811c027b6323d0e8de076d86b3acbb9c01f6185e18ec0
image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle@sha256:6ff255f75a2e264362cf55019add38a46fddcb6d37204899a007da58023ae2b9
- entries:
- name: serverless-operator.v1.20.0
replaces: serverless-operator.v1.19.0
Expand Down Expand Up @@ -380,12 +432,12 @@ entries:
- name: serverless-operator.v1.33.0
replaces: serverless-operator.v1.32.0
skipRange: '>=1.32.0 <1.33.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
- name: serverless-operator.v1.34.0
replaces: serverless-operator.v1.33.0
skipRange: '>=1.33.0 <1.34.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
name: stable-1.35
package: serverless-operator
schema: olm.channel
Expand Down
215 changes: 134 additions & 81 deletions olm-catalog/serverless-operator-index/v4.13/catalog/serverless-operator/catalog.yaml
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 61 additions & 9 deletions olm-catalog/serverless-operator-index/v4.14/catalog-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ entries:
- name: serverless-operator.v1.33.0
replaces: serverless-operator.v1.32.0
skipRange: '>=1.32.0 <1.33.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
- name: serverless-operator.v1.34.0
replaces: serverless-operator.v1.33.0
skipRange: '>=1.33.0 <1.34.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
name: stable
package: serverless-operator
schema: olm.channel
Expand Down Expand Up @@ -290,6 +290,58 @@ entries:
name: stable-1.33
package: serverless-operator
schema: olm.channel
- entries:
- name: serverless-operator.v1.20.0
replaces: serverless-operator.v1.19.0
skipRange: '>=1.19.0 <1.20.0'
- name: serverless-operator.v1.21.0
replaces: serverless-operator.v1.20.0
skipRange: '>=1.20.0 <1.21.0'
- name: serverless-operator.v1.22.0
replaces: serverless-operator.v1.21.0
skipRange: '>=1.21.0 <1.22.0'
- name: serverless-operator.v1.23.0
replaces: serverless-operator.v1.22.0
skipRange: '>=1.22.0 <1.23.0'
- name: serverless-operator.v1.24.0
replaces: serverless-operator.v1.23.0
skipRange: '>=1.23.0 <1.24.0'
- name: serverless-operator.v1.25.0
replaces: serverless-operator.v1.24.0
skipRange: '>=1.24.0 <1.25.0'
- name: serverless-operator.v1.26.0
replaces: serverless-operator.v1.25.0
skipRange: '>=1.25.0 <1.26.0'
- name: serverless-operator.v1.27.0
replaces: serverless-operator.v1.26.0
skipRange: '>=1.26.0 <1.27.0'
- name: serverless-operator.v1.27.1
replaces: serverless-operator.v1.27.0
skipRange: '>=1.26.0 <1.27.1'
- name: serverless-operator.v1.28.0
replaces: serverless-operator.v1.27.1
skipRange: '>=1.27.0 <1.28.0'
- name: serverless-operator.v1.29.0
replaces: serverless-operator.v1.28.0
skipRange: '>=1.28.0 <1.29.0'
- name: serverless-operator.v1.30.0
replaces: serverless-operator.v1.29.0
skipRange: '>=1.29.0 <1.30.0'
- name: serverless-operator.v1.31.0
replaces: serverless-operator.v1.30.0
skipRange: '>=1.30.0 <1.31.0'
- name: serverless-operator.v1.32.0
replaces: serverless-operator.v1.31.0
skipRange: '>=1.31.0 <1.32.0'
- name: serverless-operator.v1.33.0
replaces: serverless-operator.v1.32.0
skipRange: '>=1.32.0 <1.33.0'
- name: serverless-operator.v1.34.0
replaces: serverless-operator.v1.33.0
skipRange: '>=1.33.0 <1.34.0'
name: stable-1.34
package: serverless-operator
schema: olm.channel
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:003a5c5c3682db69aa57da4c05ed3ccbaf94fb80a4972c8ddcf91eb3d5e299b9
schema: olm.bundle
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:1905984e13c9d165aad06f954904fc33d3f3a6e2f0041f98bc5840d05a87abaf
Expand Down Expand Up @@ -330,10 +382,10 @@ entries:
schema: olm.bundle
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:d96f2a6e9bdd2540c5c7b0ffe6a8e610b43ba227420892586a46fbdb9a3caef3
schema: olm.bundle
- image: registry.redhat.io/openshift-serverless-1/serverless-operator-bundle@sha256:82b9bfb8b83701db1a9b891d1ffc1e782d4b0f971fc9a53525942845c2602934
schema: olm.bundle
- schema: olm.bundle
image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle@sha256:62d1451f5c944c6fbb6ffaade5e210b5d85f0caffe56a527deff480c24cc8aeb
- schema: olm.bundle
image: registry.ci.openshift.org/knative/serverless-bundle@sha256:430c7aa5a5c4780fd4a811c027b6323d0e8de076d86b3acbb9c01f6185e18ec0
image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle@sha256:6ff255f75a2e264362cf55019add38a46fddcb6d37204899a007da58023ae2b9
- entries:
- name: serverless-operator.v1.20.0
replaces: serverless-operator.v1.19.0
Expand Down Expand Up @@ -380,12 +432,12 @@ entries:
- name: serverless-operator.v1.33.0
replaces: serverless-operator.v1.32.0
skipRange: '>=1.32.0 <1.33.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
- name: serverless-operator.v1.34.0
replaces: serverless-operator.v1.33.0
skipRange: '>=1.33.0 <1.34.0'
- name: serverless-operator.v1.35.0
replaces: serverless-operator.v1.34.0
skipRange: '>=1.34.0 <1.35.0'
name: stable-1.35
package: serverless-operator
schema: olm.channel
Expand Down
Loading
Loading