Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[release-1.9] fix CRModification alert in upgrade #2305

Merged
merged 1 commit into from Apr 3, 2023
Merged

[release-1.9] fix CRModification alert in upgrade #2305

merged 1 commit into from Apr 3, 2023

Conversation

kubevirt-bot
Copy link
Contributor

This is an automated cherry-pick of #2297

/assign tiraboschi

Fix bug [https://issues.redhat.com/browse/CNV-22746] - should not trigger alerts during upgrade

@nunnatsa
fix CRModification alert in upgrade
1bfa607 
The KubevirtHyperconvergedClusterOperatorCRModification alert is triggered on upgrade for some resource metrics.

This PR fixes this bug and prevents these alerts.

Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>
@kubevirt-bot kubevirt-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Mar 29, 2023
@kubevirt-bot kubevirt-bot mentioned this pull request Mar 29, 2023
Merged
11 tasks
@kubevirt-bot kubevirt-bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Mar 29, 2023
@sonarcloud
Copy link

sonarcloud bot commented Mar 29, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@hco-bot
Copy link
Collaborator

hco-bot commented Mar 29, 2023

hco-e2e-upgrade-prev-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-azure
hco-e2e-upgrade-prev-index-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-sno-azure
hco-e2e-upgrade-index-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-index-sno-azure

@kubevirt-bot
Copy link
Contributor Author

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-index-sno-azure, ci/prow/hco-e2e-upgrade-prev-index-azure, ci/prow/hco-e2e-upgrade-prev-index-sno-azure

In response to this:

hco-e2e-upgrade-prev-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-azure
hco-e2e-upgrade-prev-index-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-sno-azure
hco-e2e-upgrade-index-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-index-sno-azure

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/test-infra repository.

@tiraboschi
Copy link
Member

/hold

@kubevirt-bot kubevirt-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 31, 2023
@tiraboschi
Copy link
Member

/retest

1 similar comment
@nunnatsa
Copy link
Collaborator

nunnatsa commented Apr 3, 2023

/retest

@openshift-ci
Copy link

openshift-ci bot commented Apr 3, 2023

@kubevirt-bot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/hco-e2e-image-index-sno-azure 1bfa607 link false /test hco-e2e-image-index-sno-azure
ci/prow/hco-e2e-kv-smoke-azure 1bfa607 link true /test hco-e2e-kv-smoke-azure

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@nunnatsa
Copy link
Collaborator

nunnatsa commented Apr 3, 2023

/override-bot

@nunnatsa
Copy link
Collaborator

nunnatsa commented Apr 3, 2023

/approve

@kubevirt-bot
Copy link
Contributor Author

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nunnatsa

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2023
@nunnatsa
Copy link
Collaborator

nunnatsa commented Apr 3, 2023

hco-e2e-image-index-sno-aws lane passed
/override ci/prow/hco-e2e-image-index-sno-azure

ci/prow/hco-e2e-kv-smoke-gcp lane passed
/override ci/prow/hco-e2e-kv-smoke-azure

@kubevirt-bot
Copy link
Contributor Author

@nunnatsa: Overrode contexts on behalf of nunnatsa: ci/prow/hco-e2e-image-index-sno-azure, ci/prow/hco-e2e-kv-smoke-azure

In response to this:

hco-e2e-image-index-sno-aws lane passed
/override ci/prow/hco-e2e-image-index-sno-azure

ci/prow/hco-e2e-kv-smoke-gcp lane passed
/override ci/prow/hco-e2e-kv-smoke-azure

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/test-infra repository.

@nunnatsa
Copy link
Collaborator

nunnatsa commented Apr 3, 2023

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2023
@tiraboschi
Copy link
Member

/unhold

@kubevirt-bot kubevirt-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 3, 2023
@kubevirt-bot kubevirt-bot merged commit a9780e7 into kubevirt:release-1.9 Apr 3, 2023
2 checks passed
@tiraboschi
Copy link
Member

/cherry-pick release-1.8

@tiraboschi
Copy link
Member

/cherry-pick release-1.7

@kubevirt-bot kubevirt-bot mentioned this pull request Sep 11, 2023
Closed
@kubevirt-bot
Copy link
Contributor Author

@tiraboschi: new pull request created: #2500

In response to this:

/cherry-pick release-1.8

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/test-infra repository.

@kubevirt-bot
Copy link
Contributor Author

@tiraboschi: #2305 failed to apply on top of branch "release-1.7":

Applying: fix CRModification alert in upgrade
Using index info to reconstruct a base tree...
A	controllers/alerts/metrics_test.go
A	controllers/alerts/reconciler.go
M	controllers/hyperconverged/hyperconverged_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/hyperconverged/hyperconverged_controller.go
CONFLICT (content): Merge conflict in controllers/hyperconverged/hyperconverged_controller.go
CONFLICT (modify/delete): controllers/alerts/reconciler.go deleted in HEAD and modified in fix CRModification alert in upgrade. Version fix CRModification alert in upgrade of controllers/alerts/reconciler.go left in tree.
CONFLICT (modify/delete): controllers/alerts/metrics_test.go deleted in HEAD and modified in fix CRModification alert in upgrade. Version fix CRModification alert in upgrade of controllers/alerts/metrics_test.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix CRModification alert in upgrade
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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/test-infra repository.

@tiraboschi tiraboschi mentioned this pull request Sep 26, 2023
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nunnatsa nunnatsa Awaiting requested review from nunnatsa

@orenc1 orenc1 Awaiting requested review from orenc1

Assignees

@tiraboschi tiraboschi

@nunnatsa nunnatsa

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kubevirt-bot @hco-bot @tiraboschi @nunnatsa