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

fix(annotations): merge CSV and pod template annotations when installing deployments #585

Merged
merged 1 commit into from
Dec 3, 2018
Merged

fix(annotations): merge CSV and pod template annotations when installing deployments #585

merged 1 commit into from
Dec 3, 2018

Conversation

njhale
Copy link
Member

@njhale njhale commented Nov 27, 2018 •
edited
Loading

Description

Merges CSV and pod template annotations when installing deployments

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 27, 2018
@njhale njhale changed the title fix(mod): correct go.sum k8s checksum mismatch fix(annotations): merge CSV and pod template annotations when installing deployments Nov 27, 2018
ecordell
ecordell approved these changes Nov 27, 2018
View reviewed changes
Copy link
Member

@ecordell ecordell left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 27, 2018
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 27, 2018
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 27, 2018
@openshift-ci-robot
Copy link
Collaborator

New changes are detected. LGTM label has been removed.

@njhale njhale closed this Nov 28, 2018
@njhale njhale reopened this Nov 28, 2018
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 2, 2018
@njhale njhale merged commit ff0ea15 into operator-framework:master Dec 3, 2018
@openshift-ci-robot
Copy link
Collaborator

@njhale: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-olm 78e1788 link /test e2e-aws-olm
ci/prow/images 78e1788 link /test images
ci/prow/e2e-aws 78e1788 link /test e2e-aws

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

ecordell pushed a commit to ecordell/operator-lifecycle-manager that referenced this pull request Mar 8, 2019
@njhale
Merge pull request operator-framework#585 from njhale/fix-mod-checksum
2b9b5a9 
fix(annotations): merge CSV and pod template annotations when installing deployments
@njhale njhale added the kind/bug Categorizes issue or PR as related to a bug. label Mar 19, 2019
@njhale njhale deleted the fix-mod-checksum branch September 30, 2019 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ecordell ecordell ecordell approved these changes

@alecmerdler alecmerdler Awaiting requested review from alecmerdler

@jpeeler jpeeler Awaiting requested review from jpeeler

Assignees

@ecordell ecordell

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@njhale @openshift-ci-robot @ecordell