add support for handling plain+v0 bundle types #242
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
the
do-not-merge/work-in-progress
4 tasks
everettraven
force-pushed
the
feature/plain-bundle-support
branch
from
e53ddd1 to
a49efb5
Compare
openshift-merge-robot
added
the
needs-rebase
joelanford
reviewed
Jun 2, 2023
joelanford
reviewed
Jun 2, 2023
joelanford
reviewed
Jun 2, 2023
joelanford
reviewed
Jun 2, 2023
everettraven
force-pushed
the
feature/plain-bundle-support
branch
from
771b5f8 to
44d2c15
Compare
openshift-merge-robot
removed
the
needs-rebase
everettraven
force-pushed
the
feature/plain-bundle-support
branch
2 times, most recently
from
a7ee2fa to
5eb8b1e
Compare
everettraven
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
| @@ -245,12 +255,13 @@ func (r *OperatorReconciler) getBundleEntityFromSolution(solution *solver.Soluti | |||
| return nil, fmt.Errorf("entity for package %q not found in solution", packageName) | |||
| } | |||
|
|
|||
| func (r *OperatorReconciler) generateExpectedBundleDeployment(o operatorsv1alpha1.Operator, bundlePath string) *unstructured.Unstructured { | |||
| func (r *OperatorReconciler) generateExpectedBundleDeployment(o operatorsv1alpha1.Operator, bundlePath string, bundleProvisioner string) *unstructured.Unstructured { | |||
| // We use unstructured here to avoid problems of serializing default values when sending patches to the apiserver. | |||
There was a problem hiding this comment.
This isn't new code for this PR but ... why not use SSA?
There was a problem hiding this comment.
Looks like it does here:
Although I could be misunderstanding this patch call as doing SSA and it isn't. ThisgenerateExpectedBundleDeployment is generating an unstructured.Unstructured to use for that patch request. I'd be curious to see if it is worth it to create applyconfigurations for the rukpak APIs to improve the creation of the patch information here
There was a problem hiding this comment.
I'd be curious to see if it is worth it to create applyconfigurations for the rukpak APIs to improve the creation of the patch information here
We updated the generators upstream so you should get those free with newer codegen tools. I do think the apply you linked will be SSA - and the defaults worries from this block should be obviated.
There was a problem hiding this comment.
Watching this closely :) kubernetes-sigs/controller-tools#818
anik120
requested changes
Jun 6, 2023
testdata/bundles/registry-v1/prometheus-operator.v0.47.0/metadata/annotations.yaml
Outdated
Show resolved
Hide resolved
joelanford
reviewed
Jun 8, 2023
Comment on lines
+72
to
+73
| err = c.List(ctx, pList) | ||
| g.Expect(err).ToNot(HaveOccurred()) |
There was a problem hiding this comment.
For anything that just returns an error, I find this is shorter/easier to parse:
Suggested change
| err = c.List(ctx, pList) | |
| g.Expect(err).ToNot(HaveOccurred()) | |
| g.Expect(c.List(ctx, pList)).To(Succeed()) |
There was a problem hiding this comment.
Oops, missed some: 7f4c1bf
joelanford
reviewed
Jun 8, 2023
Comment on lines
39
to
41
| relatedImages: | ||
| - name: "" | ||
| image: "" |
There was a problem hiding this comment.
We could remove this if we merge #259 first.
|
New changes are detected. LGTM label has been removed. |
openshift-merge-robot
added
the
needs-rebase
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
everettraven
force-pushed
the
feature/plain-bundle-support
branch
from
7f4c1bf to
8abcc14
Compare
openshift-merge-robot
removed
the
needs-rebase
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
joelanford
reviewed
Jun 8, 2023
| }) | ||
| }) | ||
| }) | ||
| When("an invalid semver is provided that bypasses the regex validation", func() { |
There was a problem hiding this comment.
This may have been missed in the merge. I moved this in #257.
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
joelanford
approved these changes
Jun 8, 2023
awgreene
pushed a commit
to awgreene/operator-controller
that referenced
this pull request
Oct 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds logic for differentiating between
plain+v0andregistry+v1bundle formats and configuring the properprovisionerClassNamefor theBundletemplate in theBundleDeployment.Spec.Templatefield.Adds unit tests where necessary
Adds e2e tests for installing a
plain+v0bundleAdds a
plain+v0bundle to the testdata catalogresolves Support installation of different bundle formats #238
Reviewer Checklist