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

OCPBUGS-27330: fix: avoid topolvm-controller annotation generation increment #542

Merged

Conversation

jakobmoellerdev
Copy link
Contributor

@jakobmoellerdev jakobmoellerdev commented Jan 18, 2024

Removes the unnecessary annotation patch that also overrode the deployment.kubernetes.io/revision annotation generated by the k8s controller causing additional spec generations

Co-authored-by: Suleyman Akbas <[email protected]>
Signed-off-by: Jakob Möller <[email protected]>
@jakobmoellerdev jakobmoellerdev changed the title fix: avoid topolvm-controller annotation generation increment OCPBUGS-27330: fix: avoid topolvm-controller annotation generation increment Jan 18, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 18, 2024
@openshift-ci-robot
Copy link

@jakobmoellerdev: This pull request references Jira Issue OCPBUGS-27330, which is invalid:

  • expected Jira Issue OCPBUGS-27330 to depend on a bug targeting a version in 4.16.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Removes the unnecessary annotation patch that also overrode the deployment.kubernetes.io/revision annotation generated by the k8s controller causing additional spec generations

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 18, 2024
Copy link
Contributor

openshift-ci bot commented Jan 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jakobmoellerdev

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2024
@jakobmoellerdev
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link

@jakobmoellerdev: This pull request references Jira Issue OCPBUGS-27330, which is invalid:

  • expected dependent Jira Issue OCPBUGS-27331 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is Closed (Done) instead
  • expected dependent Jira Issue OCPBUGS-27331 to target a version in 4.16.0, but it targets "4.16" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@jakobmoellerdev
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 18, 2024
@openshift-ci-robot
Copy link

@jakobmoellerdev: This pull request references Jira Issue OCPBUGS-27330, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-27331 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-27331 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @radeore

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from radeore January 18, 2024 09:28
@jakobmoellerdev
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@jakobmoellerdev: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

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.

@jakobmoellerdev
Copy link
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@jakobmoellerdev: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.13

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.

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b50bf96) 81.78% compared to head (6a5fab9) 81.78%.
Report is 2 commits behind head on release-4.15.

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff              @@
##           release-4.15     #542   +/-   ##
=============================================
  Coverage         81.78%   81.78%           
=============================================
  Files                24       24           
  Lines              1795     1795           
=============================================
  Hits               1468     1468           
  Misses              223      223           
  Partials            104      104           

@suleymanakbas91
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2024
Copy link
Contributor

openshift-ci bot commented Jan 18, 2024

@jakobmoellerdev: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot bot merged commit edc2f25 into openshift:release-4.15 Jan 18, 2024
7 checks passed
@openshift-ci-robot
Copy link

@jakobmoellerdev: Jira Issue OCPBUGS-27330: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-27330 has been moved to the MODIFIED state.

In response to this:

Removes the unnecessary annotation patch that also overrode the deployment.kubernetes.io/revision annotation generated by the k8s controller causing additional spec generations

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot

@jakobmoellerdev: #542 failed to apply on top of branch "release-4.14":

Applying: fix: avoid topolvm-controller annotation generation increment
Using index info to reconstruct a base tree...
A	internal/controllers/lvmcluster/resource/topolvm_controller.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): internal/controllers/lvmcluster/resource/topolvm_controller.go deleted in HEAD and modified in fix: avoid topolvm-controller annotation generation increment. Version fix: avoid topolvm-controller annotation generation increment of internal/controllers/lvmcluster/resource/topolvm_controller.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: avoid topolvm-controller annotation generation increment
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-4.14

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.

@openshift-cherrypick-robot

@jakobmoellerdev: #542 failed to apply on top of branch "release-4.13":

Applying: fix: avoid topolvm-controller annotation generation increment
Using index info to reconstruct a base tree...
A	internal/controllers/lvmcluster/resource/topolvm_controller.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): internal/controllers/lvmcluster/resource/topolvm_controller.go deleted in HEAD and modified in fix: avoid topolvm-controller annotation generation increment. Version fix: avoid topolvm-controller annotation generation increment of internal/controllers/lvmcluster/resource/topolvm_controller.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: avoid topolvm-controller annotation generation increment
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-4.13

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.

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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants