Port of #1934 and #1936

[feloy]

Port of #1934 and #1936 on next release's branch

[feloy]

converted to draft, will add the unit tests when #1936 is done

[k8s-triage-robot]

Unknown CLA label state. Rechecking for CLA labels.

Send feedback to sig-contributor-experience at kubernetes/community.

/check-cla
/easycla

[mstruebing]

/lgtm
/approve

Thanks 🚀

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feloy, mstruebing

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 [mstruebing]

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

[feloy]

Thanks @mstruebing :) I can see that this PR have missed the release of 1.0-rc7. Is there an expected date for the next 1.x release?

[mstruebing]

Not yet, usually in line with the next Kubernetes release or if we have a bunch of features/fixes we want to get out there.
In cases of a very important fix we can do a patch release like the last one where a security vulnerability in a dependency was patched.