-
Notifications
You must be signed in to change notification settings - Fork 562
Annotate CRDs that are installed alongside CSVs. #2114
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
Merged
openshift-merge-robot
merged 1 commit into
operator-framework:master
from
benluddy:alongside
May 7, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| package catalog | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
|
||
| "github.com/operator-framework/api/pkg/operators/v1alpha1" | ||
| v1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1" | ||
| "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/internal/alongside" | ||
| "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorlister/operatorlisterfakes" | ||
| ) | ||
|
|
||
| func TestSetInstalledAlongsideAnnotation(t *testing.T) { | ||
| for _, tc := range []struct { | ||
| Name string | ||
| NewNamespace string | ||
| NewName string | ||
| CSVs []v1alpha1.ClusterServiceVersion | ||
| Before []alongside.NamespacedName | ||
| After []alongside.NamespacedName | ||
| }{ | ||
| { | ||
| Name: "object annotated with bundle name", | ||
| NewNamespace: "test-namespace", | ||
| NewName: "test-name", | ||
| After: []alongside.NamespacedName{ | ||
| {Namespace: "test-namespace", Name: "test-name"}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "annotations referencing missing bundles removed", | ||
| NewNamespace: "test-namespace", | ||
| NewName: "test-name", | ||
| Before: []alongside.NamespacedName{ | ||
| {Namespace: "missing-namespace", Name: "missing-name"}, | ||
| }, | ||
| After: []alongside.NamespacedName{ | ||
| {Namespace: "test-namespace", Name: "test-name"}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "annotations referencing copied csv removed", | ||
| NewNamespace: "test-namespace", | ||
| NewName: "test-name", | ||
| CSVs: []v1alpha1.ClusterServiceVersion{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "copied-namespace", | ||
| Name: "copied-name", | ||
| }, | ||
| Status: v1alpha1.ClusterServiceVersionStatus{ | ||
| Reason: v1alpha1.CSVReasonCopied, | ||
| }, | ||
| }, | ||
| }, | ||
| Before: []alongside.NamespacedName{ | ||
| {Namespace: "copied-namespace", Name: "copied-name"}, | ||
| }, | ||
| After: []alongside.NamespacedName{ | ||
| {Namespace: "test-namespace", Name: "test-name"}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "annotations referencing found bundles preserved", | ||
| NewNamespace: "test-namespace", | ||
| NewName: "test-name", | ||
| CSVs: []v1alpha1.ClusterServiceVersion{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "found-namespace", | ||
| Name: "found-name", | ||
| }, | ||
| }, | ||
| }, | ||
| Before: []alongside.NamespacedName{ | ||
| {Namespace: "found-namespace", Name: "found-name"}, | ||
| }, | ||
| After: []alongside.NamespacedName{ | ||
| {Namespace: "found-namespace", Name: "found-name"}, | ||
| {Namespace: "test-namespace", Name: "test-name"}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "nothing added if namespace empty", | ||
| NewNamespace: "", | ||
| NewName: "test-name", | ||
| CSVs: []v1alpha1.ClusterServiceVersion{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "found-namespace", | ||
| Name: "found-name", | ||
| }, | ||
| }, | ||
| }, | ||
| Before: []alongside.NamespacedName{ | ||
| {Namespace: "found-namespace", Name: "found-name"}, | ||
| }, | ||
| After: []alongside.NamespacedName{ | ||
| {Namespace: "found-namespace", Name: "found-name"}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "nothing added if name empty", | ||
| NewNamespace: "test-namespace", | ||
| NewName: "", | ||
| CSVs: []v1alpha1.ClusterServiceVersion{ | ||
| { | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "found-namespace", | ||
| Name: "found-name", | ||
| }, | ||
| }, | ||
| }, | ||
| Before: []alongside.NamespacedName{ | ||
| {Namespace: "found-namespace", Name: "found-name"}, | ||
| }, | ||
| After: []alongside.NamespacedName{ | ||
| {Namespace: "found-namespace", Name: "found-name"}, | ||
| }, | ||
| }, | ||
| } { | ||
| t.Run(tc.Name, func(t *testing.T) { | ||
| csvsByNamespace := make(map[string][]*v1alpha1.ClusterServiceVersion) | ||
| for _, csv := range tc.CSVs { | ||
| csvsByNamespace[csv.GetNamespace()] = append(csvsByNamespace[csv.GetNamespace()], csv.DeepCopy()) | ||
| } | ||
|
|
||
| nsListers := make(map[string]v1alpha1listers.ClusterServiceVersionNamespaceLister) | ||
| for ns, csvs := range csvsByNamespace { | ||
| ns := ns | ||
| csvs := csvs | ||
| nslister := &operatorlisterfakes.FakeClusterServiceVersionNamespaceLister{} | ||
| nslister.GetCalls(func(name string) (*v1alpha1.ClusterServiceVersion, error) { | ||
| for _, csv := range csvs { | ||
| if csv.GetName() == name { | ||
| return csv, nil | ||
| } | ||
| } | ||
| return nil, errors.NewNotFound(schema.GroupResource{}, name) | ||
| }) | ||
| nsListers[ns] = nslister | ||
| } | ||
|
|
||
| emptyLister := &operatorlisterfakes.FakeClusterServiceVersionNamespaceLister{} | ||
| emptyLister.GetCalls(func(name string) (*v1alpha1.ClusterServiceVersion, error) { | ||
| return nil, errors.NewNotFound(schema.GroupResource{}, name) | ||
| }) | ||
|
|
||
| csvLister := &operatorlisterfakes.FakeClusterServiceVersionLister{} | ||
| csvLister.ClusterServiceVersionsCalls(func(namespace string) v1alpha1listers.ClusterServiceVersionNamespaceLister { | ||
| if lister, ok := nsListers[namespace]; ok { | ||
| return lister | ||
| } | ||
| return emptyLister | ||
| }) | ||
|
|
||
| var ( | ||
| dst, src metav1.ObjectMeta | ||
| a alongside.Annotator | ||
| ) | ||
| a.ToObject(&src, tc.Before) | ||
| setInstalledAlongsideAnnotation(a, &dst, tc.NewNamespace, tc.NewName, csvLister, &src) | ||
| after := a.FromObject(&dst) | ||
| assert.ElementsMatch(t, tc.After, after) | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: is this supposed to be part of the following group of imports?