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

Update the vendor Makefile target and update the vendored dependencies #590

Merged
merged 2 commits into from Feb 23, 2021

Conversation

timflannagan
Copy link
Contributor

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

Run `make vendor` locally and commit the changes.

Removes the unused k8s.io/apiserver dependency and it's implicit
dependencies.
@@ -55,7 +55,6 @@ require (
k8s.io/api v0.20.0
k8s.io/apiextensions-apiserver v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/apiserver v0.20.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was looking through the codebase and noticed that the apiserver dependency was unused. It looks like running go mod tidy locally backed up this assumption.

Copy link
Member

Choose a reason for hiding this comment

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

We used to vendor more k8s stuff in this repo and had a bit of circular deps between OLM and registry. We decoupled them and resolved those issues. So this is probably leftover that is not cleaned-up.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that's understandable. I was looking through the codebase and noticed that, and I have Go 1.16 locally which was able to spot that in the go.mod. This could also just be an artifact from the Go 1.15 bump from last week.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, this kind of scenario is exactly why I added a vendor check in the metering-related repositories. I can add something similar as an action or update the prow configuration.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nice, it looks like #596 is already producing CI feedback that prompted this PR. It looks like there may be some race conditions in the bundle unpacking test that are popping up this week. We need to merge this change first before attempting to merge that vendor action check.

@codecov
Copy link

codecov bot commented Feb 22, 2021

Codecov Report

Merging #590 (2fe523d) into master (7b885c6) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #590   +/-   ##
=======================================
  Coverage   48.80%   48.80%           
=======================================
  Files          90       90           
  Lines        6278     6278           
=======================================
  Hits         3064     3064           
  Misses       2529     2529           
  Partials      685      685           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b885c6...aaeda4d. Read the comment docs.

Makefile Show resolved Hide resolved
@dinhxuanvu
Copy link
Member

/test e2e-aws

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.

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 23, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 23, 2021

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

Test name Commit Details Rerun command
ci/prow/e2e-aws aaeda4d link /test e2e-aws

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.

Copy link
Member

@joelanford joelanford 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 Feb 23, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu, joelanford, timflannagan

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

/retest

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

@timflannagan timflannagan merged commit 51afdf6 into operator-framework:master Feb 23, 2021
@timflannagan timflannagan deleted the update-vendoring branch February 23, 2021 16:26
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants