-
Notifications
You must be signed in to change notification settings - Fork 73
🌱 chore(ci): Add test to check if user changes are preserved #2512
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
openshift-merge-bot
merged 1 commit into
operator-framework:main
from
camilamacedo86:test-asked
Mar 19, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| @BoxcutterRuntime | ||
| Feature: Preserve user-managed fields on deployed resources | ||
| Fields that OLM does not declare ownership of (e.g. user-applied annotations | ||
| and labels) belong to other managers and must be preserved across reconciliation | ||
| cycles. | ||
|
|
||
| Background: | ||
| Given OLM is available | ||
| And ClusterCatalog "test" serves bundles | ||
| And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE} | ||
| And ClusterExtension is applied | ||
| """ | ||
| apiVersion: olm.operatorframework.io/v1 | ||
| kind: ClusterExtension | ||
| metadata: | ||
| name: ${NAME} | ||
| spec: | ||
| namespace: ${TEST_NAMESPACE} | ||
| serviceAccount: | ||
| name: olm-sa | ||
| source: | ||
| sourceType: Catalog | ||
| catalog: | ||
| packageName: test | ||
| selector: | ||
| matchLabels: | ||
| "olm.operatorframework.io/metadata.name": test-catalog | ||
| """ | ||
| And ClusterExtension is rolled out | ||
| And ClusterExtension is available | ||
| And resource "deployment/test-operator" is available | ||
|
|
||
| Scenario: User-added annotations and labels coexist with bundle-defined labels after reconciliation | ||
| # The bundle defines labels on the deployment via the CSV spec; verify they are present | ||
| Given resource "deployment/test-operator" has labels | ||
| | key | value | | ||
| | app.kubernetes.io/name | test-operator | | ||
| When annotations are added to "deployment/test-operator" | ||
| | key | value | | ||
| | example.com/custom-annotation | my-value | | ||
| And labels are added to "deployment/test-operator" | ||
| | key | value | | ||
| | example.com/custom-label | my-value | | ||
| And ClusterExtension reconciliation is triggered | ||
| And ClusterExtension has been reconciled the latest generation | ||
| Then resource "deployment/test-operator" has annotations | ||
| | key | value | | ||
| | example.com/custom-annotation | my-value | | ||
| And resource "deployment/test-operator" has labels | ||
| | key | value | | ||
| | example.com/custom-label | my-value | | ||
| | app.kubernetes.io/name | test-operator | | ||
|
|
||
| Scenario: Deployment rollout restart persists after OLM reconciliation | ||
| When rollout restart is performed on "deployment/test-operator" | ||
| Then deployment "test-operator" pod template has annotation "kubectl.kubernetes.io/restartedAt" | ||
| And deployment "test-operator" rollout is complete | ||
| And deployment "test-operator" has 2 replica sets | ||
| When ClusterExtension reconciliation is triggered | ||
| And ClusterExtension has been reconciled the latest generation | ||
| Then deployment "test-operator" pod template has annotation "kubectl.kubernetes.io/restartedAt" | ||
| And deployment "test-operator" rollout is complete | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can remove this test, because it adds annotations to deployment and we have covered that in the previous test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lets keep has no harm !!