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

Only create marketplace publish after container image have been published #2084

Merged
merged 4 commits into from
Apr 24, 2024
Merged

Only create marketplace publish after container image have been published #2084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cdc7d8
Only create marketplace publish after container image have been publi…
pjuarezd Apr 19, 2024
b1abd0b
remove olm-post-script.sh
pjuarezd Apr 19, 2024
c90f0af
add "skips" where there is a new Index
pjuarezd Apr 19, 2024
0ab3b58
Update olm.sh
pjuarezd Apr 22, 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
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ helm-reindex:

release: assets
@./release.sh
@./olm.sh

apply-gofmt:
@echo "Applying gofmt to all generated an existing files"
Expand Down
4 changes: 1 addition & 3 deletions community-operators/update-community-operator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@ git rebase upstream/main
git push

echo " "
echo "Execute olm.sh and then olm-post-script.sh"
echo "Execute olm.sh"
echo "As a work around get working scripts from your repository"
cp ~/minio/olm-scripts/community-operators/olm.sh ~/operator/olm.sh
cp ~/minio/olm-scripts/community-operators/olm-post-script.sh ~/operator/olm-post-script.sh
cd ~/operator || return
source olm.sh
source olm-post-script.sh

echo " "
echo "Create the branch:"
Expand Down
65 changes: 0 additions & 65 deletions olm-post-script.sh
View file
Open in desktop

This file was deleted.

38 changes: 28 additions & 10 deletions olm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

#binary versions
OPERATOR_SDK_VERSION=v1.22.2
OPERATOR_SDK_VERSION=v1.34.1
TMP_BIN_DIR="$(mktemp -d)"

function install_binaries() {
Expand All @@ -24,8 +24,10 @@ function install_binaries() {

install_binaries

RELEASE="$(sed -n 's/^.*DefaultOperatorImage = "minio\/operator:v\(.*\)"/\1/p' pkg/controller/operator.go)"

# get the minio version
minioVersionInExample=$(kustomize build examples/kustomization/tenant-openshift | yq eval-all '.spec.image' | tail -1)
pjuarezd marked this conversation as resolved.
Show resolved Hide resolved
minioVersionInExample=$(kustomize build examples/kustomization/tenant-lite | yq eval-all '.spec.image' | tail -1)
echo "minioVersionInExample: ${minioVersionInExample}"

# Get sha form of minio version
Expand Down Expand Up @@ -66,13 +68,15 @@ for catalog in "${redhatCatalogs[@]}"; do
--use-image-digests \
--kustomize-dir config/manifests

# Set the version, later in olm-post-script.sh we change for Digest form.
containerImage="quay.io/minio/operator:v${RELEASE}"
echo "containerImage: ${containerImage}"
operatorImageDigest="quay.io/minio/operator:v${RELEASE}"
yq -i ".metadata.annotations.containerImage |= (\"${operatorImageDigest}\")" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml
yq -i ".spec.install.spec.deployments[0].spec.template.spec.containers[0].image |= (\"${operatorImageDigest}\")" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml
yq -i ".spec.install.spec.deployments[1].spec.template.spec.containers[0].image |= (\"${operatorImageDigest}\")" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml
# https://connect.redhat.com/support/technology-partner/#/case/03206318
# If no securityContext is specified, the OLM will choose one that fits within
# the security context constraint either explicitly specified for the project under which the pod is run,
# or the default. If the SCC specifies a value that doesn't match the specified value in our files,
# the pods will not start properly and we can't be installed.
# Let the user select their own securityContext and don't hardcode values that can affect the ability
# to debug and deploy our Operator in OperatorHub.
echo "Removing securityContext from CSV"
yq -i eval 'del(.spec.install.spec.deployments[].spec.template.spec.containers[0].securityContext)' bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml

# Will query if a previous version of the CSV was published to the catalog of the latest supported Openshift version.
# It will help to prevent add the `spec.replaces` annotation when there is no preexisting CSV in the catalog to replace.
Expand All @@ -88,9 +92,23 @@ for catalog in "${redhatCatalogs[@]}"; do
PREV_VERSION=$(curl -s "https://catalog.redhat.com/api/containers/v1/operators/bundles?channel_name=stable&package=${package}&organization=${catalog}&ocp_version=${maxOpenshiftVersion}&include=data.version,data.csv_name,data.ocp_version" | jq '.data | max_by(.version).csv_name' -r)
echo "replaces: $PREV_VERSION"
yq -i e ".spec.replaces |= \"${PREV_VERSION}\"" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml
# We need to remove "skips" and only use "replaces"
yq -i "del(.spec.skips) " bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml
else
echo "no previous published in catalog ${maxOpenshiftVersion}, removing spec.replaces"
# This procedure is needed when a new Index is released
# Having a new Index (ie Openshift 4.15) means that Operator haven't been published in it yet, so the "replaces" annotation fails.
# To prevent it we reached out to RedHat support and told us to use "skips" instead, that way we can keep the update
# graph and publish Operator in the new Index for the first time.
# https://connect.redhat.com/support/technology-partner/#/case/03793912
echo "no previous published in index ${maxOpenshiftVersion}, removing spec.replaces"
yq -i "del(.spec.replaces) " bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml
echo "adding spec.skips for new index"
# Get the previous Openshift Index
previousOpenshiftVersion=$(curl -s "https://catalog.redhat.com/api/containers/v1/operators/indices?ocp_versions_range=${minOpenshiftVersion}-${maxOpenshiftVersion}&organization=${catalog}" | yq '.data.[].ocp_version' | sort -V | tail -n2 | head -n1)
# Get the latest published operator in the previous Openshift Index
PREV_VERSION=$(curl -s "https://catalog.redhat.com/api/containers/v1/operators/bundles?channel_name=stable&package=${package}&organization=${catalog}&ocp_version=${previousOpenshiftVersion}&include=data.version,data.csv_name,data.ocp_version" | jq '.data | max_by(.version).csv_name' -r)
echo "skips: $PREV_VERSION"
yq -i e ".spec.skips += [\"${PREV_VERSION}\"]" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml
fi

# Now promote the latest release to the root of the repository
Expand Down
4 changes: 1 addition & 3 deletions redhat-marketplace/update-redhat-marketplace-operator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,11 @@ git rebase upstream/master
git push

echo " "
echo "Execute olm.sh and then olm-post-script.sh"
echo "Execute olm.sh"
echo "As a work around get working scripts from your repository"
cp ~/minio/olm-scripts/olm.sh ~/operator/olm.sh
cp ~/minio/olm-scripts/olm-post-script.sh ~/operator/olm-post-script.sh
cd ~/operator || return
source olm.sh
source olm-post-script.sh

echo " "
echo "Create the branch:"
Expand Down
Loading