Skip to content

fix: install VPA CRD directly on clusterfor bundle e2e test #1637

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
merged 1 commit into from
Jul 16, 2020
Merged

fix: install VPA CRD directly on clusterfor bundle e2e test #1637

merged 1 commit into from
Jul 16, 2020

Conversation

exdx
Copy link
Member

@exdx exdx commented Jul 14, 2020 •
edited
Loading

Description of the change:
This fix installs the VPA CRD on-cluster directly (instead of providing it in the bundle) in the bundle e2e test. There is a check to ensure the VPA CRD is not already present. The index contents were updated alongside this PR, to remove the packaged CRD.

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

@exdx exdx requested review from ecordell and njhale July 14, 2020 19:26
njhale
njhale reviewed Jul 14, 2020
View reviewed changes
njhale
njhale reviewed Jul 14, 2020
View reviewed changes
benluddy
benluddy reviewed Jul 14, 2020
View reviewed changes
njhale
njhale reviewed Jul 14, 2020
View reviewed changes
njhale
njhale reviewed Jul 14, 2020
View reviewed changes
njhale
njhale reviewed Jul 14, 2020
View reviewed changes
njhale
njhale reviewed Jul 14, 2020
View reviewed changes
njhale
njhale reviewed Jul 14, 2020
View reviewed changes
Copy link
Member

@njhale njhale left a comment

Choose a reason for hiding this comment

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

Thanks for taking the time to look at this.

It does make me wonder how this would ever have passed in our upstream tests, was the VPA CRD pard of the bundle?

@exdx
Copy link
Member Author

exdx commented Jul 14, 2020

Thanks for taking the time to look at this.

It does make me wonder how this would ever have passed in our upstream tests, was the VPA CRD pard of the bundle?

Yes, originally it was included in the bundle as a provided API on the busybox CSV

@exdx exdx force-pushed the fix/vpa-crd-e2e branch from fb1b110 to 933486e Compare July 14, 2020 21:11
@exdx exdx requested review from benluddy and njhale July 14, 2020 21:11
njhale
njhale reviewed Jul 15, 2020
View reviewed changes
njhale
njhale reviewed Jul 15, 2020
View reviewed changes
njhale
njhale reviewed Jul 15, 2020
View reviewed changes
njhale
njhale reviewed Jul 15, 2020
View reviewed changes
@njhale
Copy link
Member

njhale commented Jul 15, 2020

/retest

@njhale njhale mentioned this pull request Jul 15, 2020
Merged
@exdx exdx force-pushed the fix/vpa-crd-e2e branch from 933486e to e4e17cc Compare July 15, 2020 17:49
@exdx exdx requested a review from njhale July 15, 2020 17:49
@exdx exdx force-pushed the fix/vpa-crd-e2e branch 2 times, most recently from 5b14993 to dd09213 Compare July 15, 2020 17:57
@exdx exdx force-pushed the fix/vpa-crd-e2e branch from dd09213 to 2c9b993 Compare July 15, 2020 19:42
@exdx
Copy link
Member Author

exdx commented Jul 15, 2020

Turns out the name of the priority class object changed, that's why we were seeing those additional 404 errors. Changed to the correct name in this PR as well.

@exdx
Copy link
Member Author

exdx commented Jul 15, 2020

/test unit

@njhale
Copy link
Member

njhale commented Jul 15, 2020

/retest

njhale
njhale reviewed Jul 16, 2020
View reviewed changes
test/e2e/testdata/vpa/crd.yaml
@@ -0,0 +1,64 @@
apiVersion: apiextensions.k8s.io/v1beta1
Copy link
Member

Choose a reason for hiding this comment

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

Note: we'll want to add a make rule to x.mk to regenerate this.

njhale
njhale approved these changes Jul 16, 2020
View reviewed changes
Copy link
Member

@njhale njhale left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks for fixing this up! I do think we'll want to tidy up and revisit the underlying problem of CR and CRD in that same bundle, but that can come in a follow up.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 16, 2020
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: exdx, 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 Jul 16, 2020
@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 964ca16 into operator-framework:master Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@njhale njhale njhale approved these changes

@ecordell ecordell Awaiting requested review from ecordell

@anik120 anik120 Awaiting requested review from anik120

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

@benluddy benluddy Awaiting requested review from benluddy

Assignees

@njhale njhale

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@exdx @njhale @openshift-ci-robot @openshift-bot @benluddy @openshift-merge-robot