[release-3.9] UPSTREAM: 59365: Fix StatefulSet set-based selector bug

[openshift-cherrypick-robot]

This is an automated cherry-pick of #18797

/assign tnozicka

[mfojtik]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mfojtik, openshift-cherrypick-robot

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:

• vendor/k8s.io/kubernetes/pkg/controller/history/OWNERS [mfojtik]
• vendor/k8s.io/kubernetes/pkg/controller/statefulset/OWNERS [mfojtik]

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

[openshift-ci-robot]

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/extended_networking_minimal	18721ff	link	/test extended_networking_minimal
ci/openshift-jenkins/gcp	18721ff	link	/test gcp

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

[mfojtik]

This is backport from master, the failures are unrelated to changes and are known infra flakes. Merging with green button.