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

Bug 1819308: Deleting a CSV removes related CSV metrics #1525

Merged
merged 1 commit into from
May 21, 2020
Merged

Bug 1819308: Deleting a CSV removes related CSV metrics #1525

merged 1 commit into from
May 21, 2020

Conversation

harishsurf
Copy link
Contributor

Problem: When creating a CSV fails, deleting it did
not clear the CSV metrics. So, when the same CSV was created
again and allowed to succeed, the olm pod still retained the
old CSV metrics

Solution: Added a new method that deletes the CSV metrics when the CSV gets deleted
Signed-off-by: Harish hgovinda@redhat.com

Description of the change:

Motivation for the change:

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@harishsurf
Deleting a CSV removes related CSV metrics
f783f16 
Problem: Bug 1819308: When creating a CSV fails, deleting it did
not clear the CSV metrics. So when the same CSV was created
again and allowed to succeed, the olm pod still retained the
old CSV metrics

Solution: Deleting a CSV will now clear its related metrics
from the olm pod

Signed-off-by: Harish <hgovinda@redhat.com>
@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 May 15, 2020
@openshift-ci-robot
Copy link
Collaborator

@harishsurf: This pull request references Bugzilla bug 1819308, 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.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1819308: Deleting a CSV removes related CSV metrics

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 May 15, 2020
@harishsurf
Copy link
Contributor Author

waiting on #1439 to merge to restructure the e2e test

@ecordell
Copy link
Member

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, harishsurf

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 May 18, 2020
@harishsurf
Copy link
Contributor Author

/retest

@exdx
Copy link
Member

exdx commented May 20, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2020
@openshift-bot
Copy link
Contributor

/retest

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

7 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 408ca95 into operator-framework:master May 21, 2020
@openshift-ci-robot
Copy link
Collaborator

@harishsurf: All pull requests linked via external trackers have merged: operator-framework/operator-lifecycle-manager#1525. Bugzilla bug 1819308 has been moved to the MODIFIED state.

In response to this:

Bug 1819308: Deleting a CSV removes related CSV metrics

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.

@jjaferson
Copy link

Hey guys, in which release will this fix be available?

@anik120
Copy link
Contributor

anik120 commented May 21, 2020

@jjaferson we're in the process of cutting a 0.15.1 release. This fix will be available as soon as the 0.15.1 is up in a couple of hours.

@harishsurf harishsurf deleted the bug-1819308 branch May 27, 2020 14:56
@harishsurf
Copy link
Contributor Author

/cherry-pick release-4.3

@openshift-cherrypick-robot
Copy link

@harishsurf: #1525 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/controller/operators/olm/operator.go
M	pkg/metrics/metrics.go
M	test/e2e/metrics_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/metrics_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/metrics_e2e_test.go
Auto-merging pkg/metrics/metrics.go
CONFLICT (content): Merge conflict in pkg/metrics/metrics.go
Auto-merging pkg/controller/operators/olm/operator.go
Patch failed at 0001 Deleting a CSV removes related CSV metrics

In response to this:

/cherry-pick release-4.3

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.

@harishsurf harishsurf mentioned this pull request Jun 3, 2020
Merged
5 tasks
@harishsurf harishsurf mentioned this pull request Jun 3, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

@exdx exdx Awaiting requested review from exdx

Assignees

@exdx exdx

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.

None yet
9 participants
@harishsurf @openshift-ci-robot @ecordell @exdx @openshift-bot @jjaferson @anik120 @openshift-cherrypick-robot @openshift-merge-robot