Unstructured support in different functions #112

somtochiama · 2020-07-22T15:07:55Z

No description provided.

k8s-ci-robot · 2020-07-22T15:08:04Z

Hi @somtochiama. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

justinsb · 2020-07-27T13:25:37Z

pkg/patterns/addon/application.go

+		}
+		version = v
+
+		healthy, _, err = unstructured.NestedBool(unstruct.Object, "spec", "healthy")


I think this should be "status" "healthy". We probably also should check the error (as you do with version)

justinsb · 2020-07-27T13:27:06Z

pkg/patterns/addon/patch.go

-		return fmt.Errorf("provided object (%T) does not implement Patchable type", object)
-	}
-
+	var p addonsv1alpha1.Patchable


Nit: Do you need to declare this here? Looks like you could declare it in on line 54 with else if p, ok := object.... ?

justinsb · 2020-07-27T13:27:39Z

pkg/patterns/addon/patch.go

+	if ok {
+		patch, _, err := unstructured.NestedSlice(unstruct.Object, "spec", "patches")
+		if err != nil {
+			return fmt.Errorf("unable to get patches from unstruct: %v", err)


Nit: unstructured, not unstruct, as we expect this will eventually bubble-up to the user.

justinsb · 2020-07-27T13:30:14Z

pkg/patterns/addon/pkg/status/aggregate.go

@@ -46,50 +47,90 @@ type aggregator struct {
 func (a *aggregator) Reconciled(ctx context.Context, src declarative.DeclarativeObject, objs *manifest.Objects) error {
 	log := log.Log

-	instance, ok := src.(addonv1alpha1.CommonObject)
-	if !ok {
+	unstruct, ok := src.(*unstructured.Unstructured)


It might be clearer if you constructed the healthy state first, and then applied it to the object. i.e. move the type-checking on src to around line 89

justinsb · 2020-07-27T13:31:17Z

pkg/patterns/addon/pkg/status/aggregate.go

+			return fmt.Errorf("unable to get status from unstructured: %v", err)
+		}
+		if !reflect.DeepEqual(status, s) {
+			err = unstructured.SetNestedField(unstruct.Object, statusHealthy, "status", "healthy")


Missed error-check here

justinsb · 2020-07-27T13:32:20Z

pkg/patterns/addon/pkg/status/aggregate.go

+
+			log.WithValues("name", unstruct.GetName()).WithValues("status", status).Info("updating status")
+
+			err = a.client.Update(ctx, unstruct)


If you make this a.client.Update(ctx, src), can you eliminate the duplication between the two if branches?

I don't know if this would work as the status wasn't changed on src. Unlike the SetNestedField in unstruct and SetCommonStatus in instance that changes the status

Do we know where we don't change src? src and unstruct are just a pointer-cast, so they should be the same object.

(Also, if we're changing status we might have to use client.Status().Update(...)

It seems every time we run the update function, src has changed. I will change to client.Status().Update(...) in another PR

justinsb · 2020-07-27T13:33:04Z

/ok-to-test

A few nits, but it's exciting to see this.

justinsb · 2020-08-10T14:08:50Z

pkg/patterns/addon/application.go

+	var healthy bool
+	var addonObject addonsv1alpha1.CommonObject
+
+	if unstruct, ok := instance.(*unstructured.Unstructured); ok {


Looking at the other PRs, we might want to create helper functions here. e.g. GetVersion and GetHealthy (or maybe GetCommonSpec and GetCommonStatus)

I could definitely work on this. I think it is a good idea

justinsb · 2020-08-10T14:13:25Z

pkg/patterns/addon/pkg/status/aggregate.go

+
+			log.WithValues("name", unstruct.GetName()).WithValues("status", status).Info("updating status")
+
+			err = a.client.Update(ctx, unstruct)


Do we know where we don't change src? src and unstruct are just a pointer-cast, so they should be the same object.

(Also, if we're changing status we might have to use client.Status().Update(...)

justinsb · 2020-08-10T14:14:19Z

One query about unstruct != src (and one suggestion for future PRs to refactor out some helper methods) but this lgtm.

Looks like we need a goimports fix though

/approve
/lgtm

k8s-ci-robot · 2020-08-10T14:14:29Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, SomtochiAma

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [justinsb]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

somtochiama · 2020-08-10T15:07:18Z

Do we know where we don't change src? src and unstruct are just a pointer-cast, so they should be the same object.

I will check on that. When we update src/unstruct, do we update the main instance?

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels Jul 22, 2020

k8s-ci-robot requested review from atoato88 and johnsonj July 22, 2020 15:08

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 22, 2020

justinsb reviewed Jul 27, 2020

View reviewed changes

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 27, 2020

somtochiama added 6 commits July 31, 2020 19:56

Handles both unstructured and commonObject

24073d9

Fixes unstructured for patches and application transform

9f56540

Removes kstatus

c3a2e08

Moved the type-check around

5ae7327

Formats go code

1a49843

Adds formatting directive for Errorf

9e95327

somtochiama force-pushed the unstructured-support branch from 4aa1e96 to 9e95327 Compare July 31, 2020 18:58

justinsb reviewed Aug 10, 2020

View reviewed changes

k8s-ci-robot assigned justinsb Aug 10, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 10, 2020

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2020

k8s-ci-robot merged commit 1d1fd97 into kubernetes-sigs:master Aug 10, 2020

somtochiama mentioned this pull request Aug 14, 2020

REQUEST: New membership for SomtochiAma kubernetes/org#2107

Closed

6 tasks

somtochiama deleted the unstructured-support branch August 20, 2020 07:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unstructured support in different functions #112

Unstructured support in different functions #112

somtochiama commented Jul 22, 2020

k8s-ci-robot commented Jul 22, 2020

justinsb Jul 27, 2020

justinsb Jul 27, 2020

justinsb Jul 27, 2020

justinsb Jul 27, 2020

justinsb Jul 27, 2020

justinsb Jul 27, 2020

somtochiama Jul 31, 2020

justinsb Aug 10, 2020

somtochiama Aug 11, 2020

justinsb commented Jul 27, 2020

justinsb Aug 10, 2020

somtochiama Aug 10, 2020

justinsb Aug 10, 2020

justinsb commented Aug 10, 2020

k8s-ci-robot commented Aug 10, 2020

somtochiama commented Aug 10, 2020


		log.WithValues("name", unstruct.GetName()).WithValues("status", status).Info("updating status")

		err = a.client.Update(ctx, unstruct)

Unstructured support in different functions #112

Unstructured support in different functions #112

Conversation

somtochiama commented Jul 22, 2020

k8s-ci-robot commented Jul 22, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justinsb commented Jul 27, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justinsb commented Aug 10, 2020

k8s-ci-robot commented Aug 10, 2020

somtochiama commented Aug 10, 2020