diff --git a/.github/workflows/build-openstack-operator.yaml b/.github/workflows/build-openstack-operator.yaml index b87864066a..1c9d6282b9 100644 --- a/.github/workflows/build-openstack-operator.yaml +++ b/.github/workflows/build-openstack-operator.yaml @@ -3,8 +3,7 @@ on: push: branches: - '*' - workflow_dispatch: # This allows manual triggering from the Actions tab if needed - + workflow_dispatch: # This allows manual triggering from the Actions tab if needed env: imageregistry: 'quay.io' imagenamespace: ${{ secrets.IMAGENAMESPACE || secrets.QUAY_USERNAME }} @@ -17,7 +16,7 @@ jobs: go_version: 1.24.x operator_sdk_version: 1.41.1 bundle_dockerfile: ./bundle.Dockerfile - operator_version: 0.6.0 + operator_version: 0.7.0 secrets: IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }} QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} diff --git a/.github/workflows/catalog-openstack-operator-upgrades.yaml b/.github/workflows/catalog-openstack-operator-upgrades.yaml index ddee8533c5..8b3bd77c3d 100644 --- a/.github/workflows/catalog-openstack-operator-upgrades.yaml +++ b/.github/workflows/catalog-openstack-operator-upgrades.yaml @@ -66,9 +66,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.6.0 - FEATURE_RELEASE_VERSION: 0.5.0 - FEATURE_RELEASE_BRANCH: 18.0-fr5 + MAIN_VERSION: 0.7.0 + FEATURE_RELEASE_VERSION: 0.6.0 + FEATURE_RELEASE_BRANCH: 18.0-fr6 BUNDLE: ${{ env.imageregistry }}/${{ env.imagenamespace }}/openstack-operator-bundle:${{ github.sha }} - name: Buildah Action id: build-operator-index-upgrade diff --git a/Makefile b/Makefile index d1b7293a4e..e1efbe2929 100644 --- a/Makefile +++ b/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.6.0 +VERSION ?= 0.7.0 OPENSTACK_RELEASE_VERSION ?= $(VERSION)-$(shell date +%s) diff --git a/hack/fake_minor_update.sh b/hack/fake_minor_update.sh index 1210f2038b..9ae8541527 100644 --- a/hack/fake_minor_update.sh +++ b/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.6 +VERSION=0.7 CURRENT=${VERSION}.0 UPDATE=${VERSION}.1 oc get csv openstack-operator.v${CURRENT} -o yaml -n openstack-operators > csv.yaml