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

[release-4.5] Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec #1734

Merged
merged 1 commit into from Sep 11, 2020
Merged

[release-4.5] Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec #1734

merged 1 commit into from Sep 11, 2020

Conversation

ankitathomas
Copy link
Contributor

Description of the change:
Updating the catalog source pod was intermittently failing due to resource version conflicts. This change switches to using Server side apply to do perform the catalog source pod update.

cherry-pick of #1624

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 20, 2020
@openshift-ci-robot
Copy link
Collaborator

@ankitathomas: This pull request references Bugzilla bug 1870782, which is invalid:

  • expected dependent Bugzilla bug 1853601 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

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

In response to this:

[release-4.5] Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec

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.

@ankitathomas ankitathomas force-pushed the catsrc-polling-4.5 branch 2 times, most recently from cfe2bd9 to 95fdf4f Compare August 21, 2020 17:03
@ankitathomas
Copy link
Contributor Author

/bugzilla refresh

@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 Aug 21, 2020
@openshift-ci-robot
Copy link
Collaborator

@ankitathomas: This pull request references Bugzilla bug 1870782, 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.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.z) matches configured target release for branch (4.5.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1853601 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1853601 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
  • bug has dependents

In response to this:

/bugzilla 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 bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 21, 2020
@ankitathomas
Copy link
Contributor Author

/retest

1 similar comment
@ankitathomas
Copy link
Contributor Author

/retest

@ankitathomas
Copy link
Contributor Author

/test run-e2e-tests

@openshift-ci-robot
Copy link
Collaborator

@ankitathomas: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test e2e-aws-console-olm
  • /test e2e-aws-olm
  • /test e2e-gcp
  • /test e2e-gcp-upgrade
  • /test images
  • /test unit
  • /test verify

Use /test all to run all jobs.

In response to this:

/test run-e2e-tests

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.

@ankitathomas
Copy link
Contributor Author

/test e2e-gcp-upgrade

@exdx
Copy link
Member

exdx commented Aug 24, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2020
@ankitathomas
Copy link
Contributor Author

/test e2e-aws-console-olm

@ankitathomas
Copy link
Contributor Author

/test e2e-gcp

@ankitathomas
Copy link
Contributor Author

/retest

2 similar comments
@ankitathomas
Copy link
Contributor Author

/retest

@ankitathomas
Copy link
Contributor Author

/retest

@njhale
Copy link
Member

njhale commented Aug 27, 2020

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, njhale

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 Aug 27, 2020
@openshift-bot
Copy link
Contributor

/retest

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

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

@ankitathomas ankitathomas added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Sep 9, 2020
@openshift-bot
Copy link
Contributor

/retest

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

2 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.

@eparis
Copy link

eparis commented Sep 11, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link
Collaborator

@eparis: This pull request references Bugzilla bug 1870782, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.z) matches configured target release for branch (4.5.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1853601 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1853601 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
  • bug has dependents

In response to this:

/bugzilla 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.

@eparis eparis added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 11, 2020
@openshift-bot
Copy link
Contributor

/retest

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

12 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-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 4bcba8c into operator-framework:release-4.5 Sep 11, 2020
@openshift-ci-robot
Copy link
Collaborator

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

Bugzilla bug 1870782 has been moved to the MODIFIED state.

In response to this:

[release-4.5] Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec

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.

@ecordell
Copy link
Member

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@ecordell: #1734 failed to apply on top of branch "release-4.4":

Applying: Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec
Using index info to reconstruct a base tree...
M	pkg/controller/operators/catalog/operator.go
M	pkg/controller/operators/catalog/operator_test.go
M	pkg/controller/registry/reconciler/grpc.go
M	pkg/controller/registry/reconciler/reconciler.go
A	test/e2e/ctx/ctx.go
M	test/e2e/metrics_e2e_test.go
M	test/e2e/util_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/util_test.go
CONFLICT (content): Merge conflict in test/e2e/util_test.go
Auto-merging test/e2e/metrics_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/metrics_e2e_test.go
CONFLICT (modify/delete): test/e2e/ctx/ctx.go deleted in HEAD and modified in Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec. Version Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec of test/e2e/ctx/ctx.go left in tree.
Auto-merging pkg/controller/registry/reconciler/reconciler.go
CONFLICT (content): Merge conflict in pkg/controller/registry/reconciler/reconciler.go
Auto-merging pkg/controller/registry/reconciler/grpc.go
CONFLICT (content): Merge conflict in pkg/controller/registry/reconciler/grpc.go
Auto-merging pkg/controller/operators/catalog/operator_test.go
Auto-merging pkg/controller/operators/catalog/operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1870782: Retry conflicting catalog source pod update after fetching latest pod spec
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.4

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.

@ankitathomas ankitathomas mentioned this pull request Sep 29, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anik120 anik120 Awaiting requested review from anik120

@Bowenislandsong Bowenislandsong Awaiting requested review from Bowenislandsong

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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
10 participants
@ankitathomas @openshift-ci-robot @exdx @njhale @openshift-bot @sdodson @eparis @ecordell @openshift-cherrypick-robot @openshift-merge-robot