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.

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

[release-v0.18] Alert VMStorageClassWarning only for Windows VMs #1126

Merged

Conversation

machadovilaca
Copy link
Member

@machadovilaca machadovilaca commented Nov 11, 2024

What this PR does / why we need it:

This is a manual cherry-pick of #984

Which issue(s) this PR fixes:

Fixes #

jira-ticket: https://issues.redhat.com/browse/CNV-50785

Special notes for your reviewer:

Release note:

Alert VMStorageClassWarning only for Windows VMs

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Nov 11, 2024
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
5 Security Hotspots
C Security Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@machadovilaca
Copy link
Member Author

/retest

@akrejcir
Copy link
Collaborator

akrejcir commented Nov 12, 2024

Are you going to open a PR for later versions too?

@machadovilaca
Copy link
Member Author

Are you going to open a PR for later versions too?

yes

@machadovilaca
Copy link
Member Author

/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 Nov 18, 2024
@sradco
Copy link
Collaborator

sradco commented Nov 21, 2024

@machadovilaca what is the status of this PR?

@machadovilaca
Copy link
Member Author

@machadovilaca what is the status of this PR?

due to the metrics bug in the kubevirt repo, the e2e tests here are failing, the fix was already merged, ill try again this later today

@machadovilaca
Copy link
Member Author

/retest

3 similar comments
@machadovilaca
Copy link
Member Author

/retest

@akrejcir
Copy link
Collaborator

/retest

@machadovilaca
Copy link
Member Author

/retest

@0xFelix
Copy link
Member

0xFelix commented Feb 18, 2025

check_committed_files seems to be unhappy.

@machadovilaca
Copy link
Member Author

check_committed_files seems to be unhappy.

The logs for this run have expired and are no longer available.

can you try to rerun that test manually?

@0xFelix
Copy link
Member

0xFelix commented Feb 18, 2025

I don't see a way to retrigger the test.

Can you run hack/check-commited-changes.sh locally?

@machadovilaca machadovilaca force-pushed the 0.18-manual-rebase-984-1122 branch from 3804429 to 649162f Compare February 20, 2025 10:56
Copy link
Member

@0xFelix 0xFelix left a comment

Choose a reason for hiding this comment

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

/approve

@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 0xFelix

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 Feb 20, 2025
@machadovilaca
Copy link
Member Author

/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 Feb 20, 2025
@machadovilaca machadovilaca force-pushed the 0.18-manual-rebase-984-1122 branch from 649162f to d4397ff Compare February 20, 2025 14:14
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
5 Security Hotspots
C Security Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@sradco
Copy link
Collaborator

sradco commented Feb 20, 2025

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2025
@kubevirt-bot kubevirt-bot merged commit b4127a3 into kubevirt:release-v0.18 Feb 20, 2025
11 checks passed
@machadovilaca
Copy link
Member Author

/cherry-pick release-v0.17

@kubevirt-bot
Copy link
Contributor

@machadovilaca: #1126 failed to apply on top of branch "release-v0.17":

Applying: Alert VMStorageClassWarning only for Windows VMs
Using index info to reconstruct a base tree...
M	internal/operands/metrics/resources.go
M	tests/monitoring_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/monitoring_test.go
CONFLICT (content): Merge conflict in tests/monitoring_test.go
Auto-merging internal/operands/metrics/resources.go
CONFLICT (content): Merge conflict in internal/operands/metrics/resources.go
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 advice.mergeConflict false"
Patch failed at 0001 Alert VMStorageClassWarning only for Windows VMs

In response to this:

/cherry-pick release-v0.17

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.

@machadovilaca
Copy link
Member Author

/cherry-pick release-v0.19

@kubevirt-bot
Copy link
Contributor

@machadovilaca: #1126 failed to apply on top of branch "release-v0.19":

Applying: Alert VMStorageClassWarning only for Windows VMs
Using index info to reconstruct a base tree...
M	internal/operands/metrics/resources.go
M	tests/monitoring_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/monitoring_test.go
CONFLICT (content): Merge conflict in tests/monitoring_test.go
Auto-merging internal/operands/metrics/resources.go
CONFLICT (content): Merge conflict in internal/operands/metrics/resources.go
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 advice.mergeConflict false"
Patch failed at 0001 Alert VMStorageClassWarning only for Windows VMs

In response to this:

/cherry-pick release-v0.19

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.

@0xFelix
Copy link
Member

0xFelix commented Feb 24, 2025

Please don't foward backport something. Ideally this should have landed in release-v0.19 first, then in release-v0.18.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants