✨ Add scale subresource logic to fake client #2855

TheSpiritXIII · 2024-06-17T14:56:59Z

Adds basic GET/UPDATE support to the scale sub-resource according to the docs: https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/client#SubResourceClientConstructor

k8s-ci-robot · 2024-06-17T14:57:08Z

Welcome @TheSpiritXIII!

It looks like this is your first PR to kubernetes-sigs/controller-runtime 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/controller-runtime has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2024-06-17T14:57:09Z

Hi @TheSpiritXIII. 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-sigs/prow repository.

troy0820 · 2024-06-17T16:01:42Z

pkg/client/fake/client.go

+func applyScale(obj client.Object, scale *autoscalingv1.Scale) error {
+	switch obj := obj.(type) {
+	case *appsv1.Deployment:
+		obj.Spec.Replicas = &scale.Spec.Replicas
+	case *appsv1.ReplicaSet:
+		obj.Spec.Replicas = &scale.Spec.Replicas
+	case *corev1.ReplicationController:
+		obj.Spec.Replicas = &scale.Spec.Replicas
+	case *appsv1.StatefulSet:
+		obj.Spec.Replicas = &scale.Spec.Replicas
+	default:
+		// TODO: CRDs https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#scale-subresource
+		return fmt.Errorf("unable to extract scale from type %T", obj)
+	}
+	return nil
+}


Wouldn't this not allow people who make CRs who wish to use the sub resource scale be limited to only allow the types in the case statement available?

Correct. This would be more work: we'd have to look-up the custom resource definition to get the scale replica field path. I propose we leave this for a future PR, since it also means writing more unit tests and I'm not sure I have bandwidth.

troy0820 · 2024-06-17T16:03:55Z

pkg/client/fake/client.go

+	switch sw.subResource {
+	case "scale":
+		scale, isScale := subResource.(*autoscalingv1.Scale)
+		if !isScale {
+			return apierrors.NewBadRequest(fmt.Sprintf("got invalid type %t, expected Scale", subResource))
+		}
+		if err := sw.client.Get(ctx, client.ObjectKeyFromObject(obj), obj); err != nil {
+			return err
+		}
+		scaleOut, err := extractScale(obj)
+		if err != nil {
+			return err
+		}
+		*scale = scaleOut
+		return nil
+	default:
+		return fmt.Errorf("fakeSubResourceClient does not support get for %s", sw.subResource)
+	}


Having to use the subresource client to then use the actual client seems like we wouldn't need the sub resource client to do the GET. The value of the scale is indicative on the spec and the subresource client has to get that value from the actual client where it's derived.

This is implemented on the server-side as far as I know. I cannot just lookup on the client because the fake client doesn't know how to extract this information. It's something of a meta-resource.

Fair and not criticizing the implementation but asking because you need to deal with this the way you are dealing with it.

alvaroaleman

Thanks a lot for looking into this, really appreciated! Few comments, we need to make really sure we behave the same way as the KAS does everywhere, because as soon as we release this, some ppl will start depending on whatever behavior it exhibits which might cause tests to incorrectly pass if this doesn't exactly match the kube apiserver behavior.

pkg/client/fake/client.go

alvaroaleman · 2024-06-18T14:48:24Z

pkg/client/fake/client.go

+		}
+		scale, isScale := updateOptions.SubResourceBody.(*autoscalingv1.Scale)
+		if !isScale {
+			return apierrors.NewBadRequest(fmt.Sprintf("got invalid type %t, expected Scale", updateOptions.SubResourceBody))


Is this the behavior of the KAS, to first complain with a bad request about the request body before checking if the main resource even exists? Please look it up and add a reference link to the relevant code in the KAS as comment.

I was unable to find it; am I looking at the right place? https://github.com/search?q=repo%3Akubernetes%2Fapiserver+scale+-path%3Atest&type=code

Nonetheless, I was able to reproduce it with client.Client.Get and your intuition is correct: it looks up the object first! Great catch.

I think the upstream code is here: https://github.com/kubernetes/kubernetes/blob/fb6bbc9781d11a87688c398778525c4e1dcb0f08/pkg/registry/apps/deployment/storage/storage.go#L320

Not exactly a quick read though it seems.

pkg/client/fake/client.go

alvaroaleman · 2024-06-24T03:37:30Z

Will try to give this a proper review this week, sorry for the delay.
/ok-to-test

TheSpiritXIII · 2024-07-01T17:48:55Z

/retest

pkg/client/fake/client.go

pkg/client/fake/client_test.go

alvaroaleman · 2024-07-24T13:47:45Z

@TheSpiritXIII will you be able to rebase and resolve the remaining comments?

TheSpiritXIII · 2024-07-25T05:21:20Z

@alvaroaleman I rebased and addressed all comments. Please let me know if there's anything else! Thanks.

TheSpiritXIII · 2024-07-25T14:37:41Z

/retest

alvaroaleman

Thank you!

k8s-ci-robot · 2024-08-03T00:55:48Z

LGTM label has been added.

Git tree hash: 61efdf2398de62581609c830c8f1b13e809c36aa

k8s-ci-robot · 2024-08-03T00:55:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, TheSpiritXIII

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~~ [alvaroaleman]

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

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 17, 2024

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 17, 2024

k8s-ci-robot requested review from alvaroaleman and FillZpp June 17, 2024 14:57

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 17, 2024

troy0820 reviewed Jun 17, 2024

View reviewed changes

alvaroaleman reviewed Jun 18, 2024

View reviewed changes

TheSpiritXIII force-pushed the fake-scale-subresource branch from 9d4522d to 1dc0cb5 Compare June 18, 2024 19:24

TheSpiritXIII requested a review from alvaroaleman June 18, 2024 20:49

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 Jun 24, 2024

TheSpiritXIII force-pushed the fake-scale-subresource branch from 1dc0cb5 to 65442bb Compare July 1, 2024 17:44

alvaroaleman reviewed Jul 6, 2024

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 9, 2024

TheSpiritXIII force-pushed the fake-scale-subresource branch from 65442bb to 78e64e7 Compare July 25, 2024 05:20

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2024

TheSpiritXIII requested a review from alvaroaleman July 25, 2024 05:20

Add scale subresource logic to fake client

00883f7

TheSpiritXIII force-pushed the fake-scale-subresource branch from 78e64e7 to 00883f7 Compare July 25, 2024 14:13

alvaroaleman approved these changes Aug 3, 2024

View reviewed changes

k8s-ci-robot assigned alvaroaleman Aug 3, 2024

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

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

k8s-ci-robot merged commit 7394f7b into kubernetes-sigs:main Aug 3, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Add scale subresource logic to fake client #2855

✨ Add scale subresource logic to fake client #2855

TheSpiritXIII commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

troy0820 Jun 17, 2024

TheSpiritXIII Jun 18, 2024

troy0820 Jun 17, 2024

TheSpiritXIII Jun 18, 2024

troy0820 Jun 18, 2024

alvaroaleman left a comment

alvaroaleman Jun 18, 2024 •

edited

Loading

TheSpiritXIII Jun 18, 2024

alvaroaleman Jun 24, 2024

alvaroaleman commented Jun 24, 2024

TheSpiritXIII commented Jul 1, 2024

alvaroaleman commented Jul 24, 2024

TheSpiritXIII commented Jul 25, 2024

TheSpiritXIII commented Jul 25, 2024

alvaroaleman left a comment

k8s-ci-robot commented Aug 3, 2024

k8s-ci-robot commented Aug 3, 2024

✨ Add scale subresource logic to fake client #2855

✨ Add scale subresource logic to fake client #2855

Conversation

TheSpiritXIII commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

troy0820 Jun 17, 2024

Choose a reason for hiding this comment

TheSpiritXIII Jun 18, 2024

Choose a reason for hiding this comment

troy0820 Jun 17, 2024

Choose a reason for hiding this comment

TheSpiritXIII Jun 18, 2024

Choose a reason for hiding this comment

troy0820 Jun 18, 2024

Choose a reason for hiding this comment

alvaroaleman left a comment

Choose a reason for hiding this comment

alvaroaleman Jun 18, 2024 • edited Loading

Choose a reason for hiding this comment

TheSpiritXIII Jun 18, 2024

Choose a reason for hiding this comment

alvaroaleman Jun 24, 2024

Choose a reason for hiding this comment

alvaroaleman commented Jun 24, 2024

TheSpiritXIII commented Jul 1, 2024

alvaroaleman commented Jul 24, 2024

TheSpiritXIII commented Jul 25, 2024

TheSpiritXIII commented Jul 25, 2024

alvaroaleman left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Aug 3, 2024

k8s-ci-robot commented Aug 3, 2024

alvaroaleman Jun 18, 2024 •

edited

Loading