Skip to content

Make empty flavours: [] disable Default Flavours#2909

Merged
openshift-merge-bot[bot] merged 14 commits into
redhat-developer:mainfrom
gazarenkov:fix-empty-flavours
May 28, 2026
Merged

Make empty flavours: [] disable Default Flavours#2909
openshift-merge-bot[bot] merged 14 commits into
redhat-developer:mainfrom
gazarenkov:fix-empty-flavours

Conversation

@gazarenkov

Copy link
Copy Markdown
Member

Description

This is the fix for the issue when setting spec.flavours: [] (empty array) in a Backstage CR does not disable default flavours as documented.

Which issue(s) does this PR fix or relate to

https://redhat.atlassian.net/browse/RHDHBUGS-3198

PR acceptance criteria

  • Tests
  • Documentation

How to test changes / Special notes to the reviewer

  1. Create a Backstage CR with explicit empty flavours array:
apiVersion: rhdh.redhat.com/v1alpha5
kind: Backstage
metadata:
  name: test-backstage
spec:
  flavours: []  # Explicitly disable all flavours
  1. Check the deployed pod's configuration
  2. Observe that default flavours (e.g., lightspeed) not loaded

Co-authored-by: gazarenkov <gazarenkov@users.noreply.github.com>
@github-actions

Copy link
Copy Markdown
Contributor

⚠️ Files changed in bundle and installer generation!

Those changes to the operator bundle/installer manifests should have been pushed automatically to your PR branch.

NOTE: If the PR checks are stuck after this additional commit, manually close the PR and immediately reopen it to trigger the checks again.

Comment thread hack/update-default-dynamic-plugins.sh Dismissed
@gazarenkov gazarenkov requested a review from rm3l May 27, 2026 13:00
@codecov

codecov Bot commented May 27, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 61.07%. Comparing base (cec3793) to head (ad8019a).
⚠️ Report is 4 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2909      +/-   ##
==========================================
+ Coverage   61.05%   61.07%   +0.01%     
==========================================
  Files          37       37              
  Lines        2108     2109       +1     
==========================================
+ Hits         1287     1288       +1     
  Misses        686      686              
  Partials      135      135              
Flag Coverage Δ
nightly ?
unittests 61.07% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
pkg/model/flavour.go 75.92% <100.00%> (+0.45%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@Fortune-Ndlovu

Copy link
Copy Markdown
Member

/agentic_review

@rhdh-qodo-merge

rhdh-qodo-merge Bot commented May 27, 2026

Copy link
Copy Markdown

Code Review by Qodo

Grey Divider

Sorry, something went wrong

We weren't able to complete the code review on our side. Please try again

Grey Divider

Qodo Logo

@Fortune-Ndlovu Fortune-Ndlovu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

When testing locally, I received no errors, and reconciliation completed cleanly. Below are just nitpicks worth considering

Comment thread config/profile/rhdh/default-config/deployment.yaml
Comment thread pkg/model/flavour.go Outdated
Comment thread pkg/model/flavour.go Outdated
Comment thread integration_tests/suite_test.go Outdated
Comment thread integration_tests/suite_test.go
@Fortune-Ndlovu

Copy link
Copy Markdown
Member

/review

@sonarqubecloud

Copy link
Copy Markdown

@Fortune-Ndlovu Fortune-Ndlovu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lgtm

@openshift-ci openshift-ci Bot added the lgtm label May 28, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 9c71119 into redhat-developer:main May 28, 2026
11 checks passed
@Fortune-Ndlovu

Copy link
Copy Markdown
Member

/cherry-pick release-1.10

@openshift-cherrypick-robot

Copy link
Copy Markdown

@Fortune-Ndlovu: #2909 failed to apply on top of branch "release-1.10":

Applying: Add workflow to update dynamic plugins
Applying: debug
Applying: fix empty flavours array not disabling default flavours
Using index info to reconstruct a base tree...
M	api/v1alpha1/zz_generated.deepcopy.go
M	api/v1alpha2/zz_generated.deepcopy.go
M	api/v1alpha3/zz_generated.deepcopy.go
M	api/v1alpha4/zz_generated.deepcopy.go
M	api/v1alpha5/zz_generated.deepcopy.go
Falling back to patching base and 3-way merge...
Auto-merging api/v1alpha5/zz_generated.deepcopy.go
Applying: fix/add tests, point plugin-catalog-index to next tag
Applying: Regenerate bundle/installer manifests
Using index info to reconstruct a base tree...
M	bundle/backstage.io/manifests/backstage-operator.clusterserviceversion.yaml
M	bundle/rhdh/manifests/backstage-operator.clusterserviceversion.yaml
M	bundle/rhdh/manifests/rhdh-default-config_v1_configmap.yaml
M	dist/rhdh/install.yaml
Falling back to patching base and 3-way merge...
Auto-merging dist/rhdh/install.yaml
Auto-merging bundle/rhdh/manifests/rhdh-default-config_v1_configmap.yaml
Auto-merging bundle/rhdh/manifests/backstage-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/rhdh/manifests/backstage-operator.clusterserviceversion.yaml
Auto-merging bundle/backstage.io/manifests/backstage-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/backstage.io/manifests/backstage-operator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0005 Regenerate bundle/installer manifests

Details

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@gazarenkov gazarenkov deleted the fix-empty-flavours branch June 17, 2026 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants