Skip to content

🐛 Populate GVK for listed objects #296

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

Closed
wants to merge 2 commits into from
Closed

🐛 Populate GVK for listed objects #296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25743c7
Populate GVK for listed objects
liyinan926 Jan 16, 2019
03072fc
Check that the right GVK gets populated
liyinan926 Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkg/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
kscheme "k8s.io/client-go/kubernetes/scheme"
kcache "k8s.io/client-go/tools/cache"

"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down Expand Up @@ -198,6 +197,19 @@ var _ = Describe("Informer Cache", func() {
Expect(actual.Namespace).To(Equal(testNamespaceOne))
})

It("should be able to list objects with GVK populated", func() {
By("listing pods")
listObj := &kcorev1.PodList{}
Expect(informerCache.List(context.Background(), listObj)).To(Succeed())

By("verifying that the returned pods have GVK populated")
Expect(listObj.Items).NotTo(BeEmpty())
Expect(listObj.Items).Should(HaveLen(3))
for _, p := range listObj.Items {
Expect(p.GroupVersionKind().Empty()).To(BeFalse())
Copy link
Contributor

@DirectXMan12 DirectXMan12 Jan 16, 2019

Choose a reason for hiding this comment

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

this should test that we list the right gvk (the corev1 package should have the package group-version as a package-level variable)

Copy link
Contributor Author

@liyinan926 liyinan926 Jan 16, 2019

Choose a reason for hiding this comment

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

Done.

}
})

It("should be able to restrict cache to a namespace", func() {
By("creating a namespaced cache")
namespacedCache, err := cache.New(cfg, cache.Options{Namespace: testNamespaceOne})
Expand Down
4 changes: 3 additions & 1 deletion pkg/cache/internal/cache_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ func (c *CacheReader) getListItems(objs []interface{}, labelSel labels.Selector)
continue
}
}
outItems = append(outItems, obj.DeepCopyObject())
outObj := obj.DeepCopyObject()
outObj.GetObjectKind().SetGroupVersionKind(c.groupVersionKind)
outItems = append(outItems, outObj)
}
return outItems, nil
}
Expand Down