Skip to content

Bug 1907381: CSV Annotations override pod annotations #1913

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
Merged
openshift-merge-robot merged 1 commit into from
Dec 23, 2020
Merged

Bug 1907381: CSV Annotations override pod annotations #1913

openshift-merge-robot merged 1 commit into from
Dec 23, 2020

Conversation

@awgreene
Copy link
Member

@awgreene awgreene commented Dec 17, 2020 •
edited
Loading

Problem: If a pod template defined in a CSV's StrategyDetailsDeployment
includes an annotation defined for the CSV OLM will fail to install the
operator because the pod's annotations do not match those defined in
the CSV.

Solution: Pod template annotations defined in a StrategyDetailsDeployment are
overwritten by those defined in the CSV.

@awgreene
CSV Annotations override pod annotations
7eb83c0 
Problem: If a pod template defined in a CSV's StrategyDetailsDeployment
includes an annotation defined for the CSV OLM will fail to install the
operator because the pod's annotations do not match those defined in
the CSV.

Solution: Pod template annotations defined in a StrategyDetailsDeployment are
overwritten by those defined in the CSV.
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Dec 17, 2020
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Dec 17, 2020

@awgreene: This pull request references Bugzilla bug 1907381, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

Bug 1907381: CSV Annotations override pod annotations

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 added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Dec 17, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 17, 2020
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Dec 17, 2020

@awgreene: This pull request references Bugzilla bug 1907381, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

Bug 1907381: CSV Annotations override pod annotations

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.

@awgreene
Copy link
Member Author

awgreene commented Dec 18, 2020

/retest

dinhxuanvu
dinhxuanvu approved these changes Dec 18, 2020
View reviewed changes
Copy link
Member

@dinhxuanvu dinhxuanvu 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2020
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Dec 18, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, dinhxuanvu

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

The pull request process is described here

Details 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-bot
Copy link
Contributor

openshift-bot commented Dec 18, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 18, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 18, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 18, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 19, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Collaborator

openshift-merge-robot commented Dec 19, 2020

@awgreene: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-olm 7eb83c0 link /test e2e-aws-olm

Full PR test history. Your PR dashboard.

Details

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.

@guillaumerose guillaumerose mentioned this pull request Dec 20, 2020
Merged
@awgreene
Copy link
Member Author

awgreene commented Dec 21, 2020

/retest

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@exdx exdx mentioned this pull request Dec 22, 2020
Closed
5 tasks
@exdx
Copy link
Contributor

exdx commented Dec 22, 2020

Closes #1868

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 22, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 427efa6 into operator-framework:master Dec 23, 2020
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Dec 23, 2020

@awgreene: All pull requests linked via external trackers have merged:

Bugzilla bug 1907381 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1907381: CSV Annotations override pod annotations

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.

@exdx exdx mentioned this pull request Jan 7, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dinhxuanvu dinhxuanvu dinhxuanvu approved these changes

@hasbro17 hasbro17 Awaiting requested review from hasbro17

Assignees

@dinhxuanvu dinhxuanvu

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@awgreene @openshift-ci-robot @openshift-bot @openshift-merge-robot @exdx @dinhxuanvu