Merge pull request #1650 from stuggi/fr4_branching

18.0-fr4 branching changes on main

Author: openshift-merge-bot[bot]

.github/workflows/catalog-openstack-operator-upgrades.yaml

@@ -79,9 +79,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.4.0
-        FEATURE_RELEASE_VERSION: 0.3.0
-        FEATURE_RELEASE_BRANCH: 18.0-fr3
+        MAIN_VERSION: 0.5.0
+        FEATURE_RELEASE_VERSION: 0.4.0
+        FEATURE_RELEASE_BRANCH: 18.0-fr4
         BUNDLE:  ${{ env.imageregistry }}/${{ env.imagenamespace }}/openstack-operator-bundle:${{ github.sha }}
 
     - name: Buildah Action

Makefile

@@ -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.4.0
+VERSION ?= 0.5.0
 
 OPENSTACK_RELEASE_VERSION ?= $(VERSION)-$(shell date +%s)
 

hack/fake_minor_update.sh

@@ -1,7 +1,7 @@
 # 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
-VERSION=0.4
+VERSION=0.5
 CURRENT=${VERSION}.0
 UPDATE=${VERSION}.1
 oc get csv openstack-operator.v${CURRENT} -o yaml -n openstack-operators  > csv.yaml