This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch release-1.4.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f167ac6c8fd02a38e5160adef38b6cea4770e3a3
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Tue May 11 13:59:20 2021 +0200
fix(e2e): Patch the OLM bundle CSV with replaces field
---
.github/workflows/upgrade.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
index 25452a2..3e56b03 100644
--- a/.github/workflows/upgrade.yml
+++ b/.github/workflows/upgrade.yml
@@ -125,17 +125,15 @@ jobs:
# replace image
$(cd config/manifests && kustomize edit set image
"docker.io/apache/camel-k=${{ env.LOCAL_IMAGE }}")
-
- # CSV the patch to force OLM upgrade
- export RELEASE_VERSION=$(make get-version | grep -Po "\d.\d.\d")
+ # Patch CSV with the 'replaces' field to define the upgrade graph
cat <<EOF > config/manifests/patch.yml
apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
namespace: placeholder
name: camel-k.v$(make get-last-released-version)
- annotations:
- olm.skipRange: ">=1.0.0 <${RELEASE_VERSION}"
+ spec:
+ replaces: camel-k-operator.v$(make get-last-released-version)
EOF
echo "Patching CSV with"
@@ -150,7 +148,7 @@ jobs:
run: |
export LOCAL_IIB=$KIND_REGISTRY/apache/camel-k-iib:$(make get-version)
echo "LOCAL_IIB=${LOCAL_IIB}" >> $GITHUB_ENV
- opm index add --bundles ${{ env.LOCAL_IMAGE_BUNDLE }} -u docker
--from-index quay.io/operatorhubio/catalog:latest --tag ${LOCAL_IIB} --skip-tls
+ opm index add --bundles ${{ env.LOCAL_IMAGE_BUNDLE }} -c docker
--from-index quay.io/operatorhubio/catalog:latest --tag ${LOCAL_IIB} --skip-tls
docker push ${LOCAL_IIB}
- name: Run IT
run: |
