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
5 changes: 2 additions & 3 deletions .github/workflows/build-openstack-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
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 @@ -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
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.6.0
VERSION ?= 0.7.0

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

Expand Down
2 changes: 1 addition & 1 deletion hack/fake_minor_update.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading