github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fed: Factor annotation mutation out of the crudtester for reuse

Browse Source
This commit is contained in:
Maru Newby
2017-05-11 11:32:25 -07:00
parent b4b5bfdb46
commit cf71a8ef11
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
federation/pkg/federatedtypes/adapter.go
View File

@@ -61,3 +61,12 @@ type FederatedTypeAdapter interface {
// be registered with RegisterAdapterFactory to ensure the type // be registered with RegisterAdapterFactory to ensure the type
// adapter is discoverable. // adapter is discoverable.
type AdapterFactory func(client federationclientset.Interface) FederatedTypeAdapter type AdapterFactory func(client federationclientset.Interface) FederatedTypeAdapter
// SetAnnotation sets the given key and value in the given object's ObjectMeta.Annotations map
func SetAnnotation(adapter FederatedTypeAdapter, obj pkgruntime.Object, key, value string) {
meta := adapter.ObjectMeta(obj)
if meta.Annotations == nil {
meta.Annotations = make(map[string]string)
}
meta.Annotations[key] = value
}

6
federation/pkg/federatedtypes/crudtester/crudtester.go
View File

@@ -193,11 +193,7 @@ func (c *FederatedTypeCRUDTester) waitForResource(client clientset.Interface, ob
func (c *FederatedTypeCRUDTester) updateFedObject(obj pkgruntime.Object) (pkgruntime.Object, error) { func (c *FederatedTypeCRUDTester) updateFedObject(obj pkgruntime.Object) (pkgruntime.Object, error) {
err := wait.PollImmediate(c.waitInterval, wait.ForeverTestTimeout, func() (bool, error) { err := wait.PollImmediate(c.waitInterval, wait.ForeverTestTimeout, func() (bool, error) {
// Target the metadata for simplicity (it's type-agnostic) // Target the metadata for simplicity (it's type-agnostic)
meta := c.adapter.ObjectMeta(obj) federatedtypes.SetAnnotation(c.adapter, obj, AnnotationTestFederationCRUDUpdate, "updated")
if meta.Annotations == nil {
meta.Annotations = make(map[string]string)
}
meta.Annotations[AnnotationTestFederationCRUDUpdate] = "updated"
_, err := c.adapter.FedUpdate(obj) _, err := c.adapter.FedUpdate(obj)
if errors.IsConflict(err) { if errors.IsConflict(err) {