Automatic merge from submit-queue (batch tested with PRs 36310, 37349, 38319, 38402, 38338)

Use the `serviceShard` variable in the service shard block, not the `service` variable.

cc @kubernetes/sig-federation