Update the owning-inventory for existing objects during migration #1318
Conversation
| if options == nil { | ||
| options = &metav1.UpdateOptions{} | ||
| } | ||
| _, err = r.Update(ctx, obj, *options) |
There was a problem hiding this comment.
Does this result in an UPDATE or a PATCH call to the apiserver? Just want to make sure we do this the same way as a regular apply operation.
There was a problem hiding this comment.
It's an UPDATE call. I didn't use the PATCH call since we should only change the metadata.annotation. Only two annotations are updated: the owning-inventory and the last-applied-config annotation. If we compute them correctly, we don't need to use the PATCH call.
There was a problem hiding this comment.
For more context: the Update call translates to a REST Put with the entire object in the body.
| if options == nil { | ||
| options = &metav1.UpdateOptions{} | ||
| } | ||
| _, err = r.Update(ctx, obj, *options) |
There was a problem hiding this comment.
For more context: the Update call translates to a REST Put with the entire object in the body.
|
Should we squash the commits before merging? |
Liujingfang1
force-pushed
the
owningInventory
branch
from
5103682
to
1e0ccb2
Compare
commit 3422bf620ace313c5b806986579d498d48404f04
Author: Jingfang Liu <jingfangliu@google.com>
Date: Mon Dec 28 13:55:32 2020 -0800
change the order of updating owning-inventory annotation and creating ResourceGorup CR
commit be90e247a8729aa7321bd3b23541894805f26cc4
Author: Jingfang Liu <jingfangliu@google.com>
Date: Tue Dec 22 16:16:46 2020 -0800
fix lint error
commit e9c9c3869268424184eb07647c1f47790c468e28
Author: Jingfang Liu <jingfangliu@google.com>
Date: Tue Dec 22 14:44:52 2020 -0800
update the last-applied-configuration properly
commit 901528a3ff3b89f4fc163d09d75dc02ac04cf4e0
Author: Jingfang Liu <jingfangliu@google.com>
Date: Tue Dec 22 14:16:41 2020 -0800
update owning-inventory annotation during migration
Liujingfang1
force-pushed
the
owningInventory
branch
from
1e0ccb2
to
bb210fe
Compare
|
@seans3 I squashed the commits. Let's wait for the tests to pass. |
After we add the InventoryPolicy in the cli-utils library, we need to update the migrate command so that the owning-inventory annotations are pointed to the ResourceGroup object. The change is to loop over the resources that are included in the ConfigMap inventory object and change their
owning-inventoryannotation to the new ResourceGroup CR.When updating the
owning-inventoryannotation, we also update the last-applied-configuration annotation.Fix #1306 This is a different approach compared with #1307.