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-24600: Apply workload annotations to pod specs #525

Merged
merged 1 commit into from
Dec 8, 2023

Conversation

suleymanakbas91
Copy link
Contributor

No description provided.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 7, 2023
Copy link
Contributor

openshift-ci bot commented Dec 7, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 7, 2023
@suleymanakbas91 suleymanakbas91 changed the title fix: apply workload annotations to pod specs OCPBUGS-24600: Apply workload annotations to pod specs Dec 7, 2023
@suleymanakbas91 suleymanakbas91 marked this pull request as ready for review December 7, 2023 17:03
@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 Dec 7, 2023
@openshift-ci-robot
Copy link

@suleymanakbas91: This pull request references Jira Issue OCPBUGS-24600, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

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:

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-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 7, 2023
@suleymanakbas91
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Dec 7, 2023
@openshift-ci-robot
Copy link

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

3 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)

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

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 7, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #525 (3a99c50) into main (c509dba) will not change coverage.
Report is 2 commits behind head on main.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #525   +/-   ##
=======================================
  Coverage   82.10%   82.10%           
=======================================
  Files          24       24           
  Lines        1788     1788           
=======================================
  Hits         1468     1468           
  Misses        219      219           
  Partials      101      101           

Copy link
Contributor

@jakobmoellerdev jakobmoellerdev left a comment

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 Indicates that a PR is ready to be merged. label Dec 8, 2023
Copy link
Contributor

openshift-ci bot commented Dec 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jakobmoellerdev, suleymanakbas91

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:
  • OWNERS [jakobmoellerdev,suleymanakbas91]

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

Copy link
Contributor

openshift-ci bot commented Dec 8, 2023

@suleymanakbas91: 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 717528e into openshift:main Dec 8, 2023
9 checks passed
@openshift-ci-robot
Copy link

@suleymanakbas91: Jira Issue OCPBUGS-24600: All pull requests linked via external trackers have merged:

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

In response to this:

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.

@suleymanakbas91
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@suleymanakbas91: #525 failed to apply on top of branch "release-4.14":

Applying: fix: apply workload annotations to pod specs
Using index info to reconstruct a base tree...
M	bundle/manifests/lvms-operator.clusterserviceversion.yaml
M	config/default/manager_custom_env.yaml
M	config/default/manager_custom_env.yaml.in
A	config/default/manager_metrics_patch.yaml
M	config/manager/manager.yaml
A	internal/controllers/lvmcluster/resource/topolvm_controller.go
A	internal/controllers/lvmcluster/resource/topolvm_node.go
A	internal/controllers/lvmcluster/resource/vgmanager.go
A	internal/controllers/lvmcluster/resource/vgmanager_daemonset.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: apply workload annotations to pod specs. Version fix: apply workload annotations to pod specs of internal/controllers/lvmcluster/resource/topolvm_controller.go left in tree.
Auto-merging controllers/vgmanager_daemonset.go
Auto-merging controllers/vgmanager.go
CONFLICT (content): Merge conflict in controllers/vgmanager.go
Auto-merging controllers/topolvm_node.go
CONFLICT (content): Merge conflict in controllers/topolvm_node.go
Auto-merging config/manager/manager.yaml
CONFLICT (modify/delete): config/default/manager_metrics_patch.yaml deleted in HEAD and modified in fix: apply workload annotations to pod specs. Version fix: apply workload annotations to pod specs of config/default/manager_metrics_patch.yaml left in tree.
Auto-merging config/default/manager_custom_env.yaml.in
Auto-merging config/default/manager_custom_env.yaml
Auto-merging bundle/manifests/lvms-operator.clusterserviceversion.yaml
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: apply workload annotations to pod specs
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.

@suleymanakbas91 suleymanakbas91 deleted the ann-fix branch December 8, 2023 14:38
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants