Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/catalog-openstack-operator-upgrades.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ jobs:
run: ./openstack-operator/hack/catalog-build-olm-upgrade.sh
env:
#FIXME: these should be pulled from a YAML config in the main operator directory?
MAIN_VERSION: 0.3.0
FEATURE_RELEASE_VERSION: 0.2.0
FEATURE_RELEASE_BRANCH: 18.0-fr2
MAIN_VERSION: 0.4.0
FEATURE_RELEASE_VERSION: 0.3.0
FEATURE_RELEASE_BRANCH: 18.0-fr3
BUNDLE: ${{ env.imageregistry }}/${{ env.imagenamespace }}/openstack-operator-bundle:${{ github.sha }}

- name: Buildah Action
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.3.0
VERSION ?= 0.4.0

OPENSTACK_RELEASE_VERSION ?= $(VERSION)-$(shell date +%s)

Expand Down
6 changes: 3 additions & 3 deletions hack/catalog-build-olm-upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#NOTE: this script is used by the catalog-openstack-operator-upgrades.yaml
set -ex

MAIN_VERSION=${MAIN_VERSION:-"0.3.0"}
FEATURE_RELEASE_VERSION=${FEATURE_RELEASE_VERSION:-"0.2.0"}
FEATURE_RELEASE_BRANCH=${FEATURE_RELEASE_BRANCH:-"18.0-fr2"}
MAIN_VERSION=${MAIN_VERSION:-"0.4.0"}
FEATURE_RELEASE_VERSION=${FEATURE_RELEASE_VERSION:-"0.3.0"}
FEATURE_RELEASE_BRANCH=${FEATURE_RELEASE_BRANCH:-"18.0-fr3"}
BUNDLE=${BUNDLE:-"quay.io/openstack-k8s-operators/openstack-operator-bundle:latest"}

[ -d "catalog" ] && rm -Rf catalog
Expand Down
4 changes: 2 additions & 2 deletions hack/fake_minor_update.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# A quick way to test a fake minor update. Run this script, and then once the
# openstackversion reconciles (the CSV will redeploy the controller-manager)
# you can set targetVersion == 0.0.2 for a quick test

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit picking: should we update the comment as well? It would be: targetVersion == 0.4.1 with this update right?

oc get csv openstack-operator.v0.3.0 -o yaml -n openstack-operators > csv.yaml
oc get csv openstack-operator.v0.4.0 -o yaml -n openstack-operators > csv.yaml
# bump them to current-podified
sed -i csv.yaml -e "s|value: .*quay.io/podified-antelope-centos9/\(.*\)@.*|value: quay.io/podified-antelope-centos9/\1:current-podified|g"
# also bump the OPENSTACK_RELEASE_VERSION value (it is the only field set like this)
sed -i csv.yaml -e "s|value: 0.3.0|value: 0.3.1|"
sed -i csv.yaml -e "s|value: 0.4.0|value: 0.4.1|"
oc apply -n openstack-operators -f csv.yaml