UPSTREAM: 58301: Limit all category to apps group for ds/deployment/r…

[deads2k]

…eplicaset

@juanvallejo @liggitt fixed it upstream, we just need to pick it.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1523493

/assign liggitt
/assign @juanvallejo

[liggitt]

do we need it for our resources that are surfaced in two groups as well? looks like the original bz referenced routes

[deads2k]

do we need it for our resources that are surfaced in two groups as well? looks like the original bz referenced routes

Already fixed. Hence my comment about, "try doing this" for you. Regrettably, I thought of it post-merge.

[juanvallejo]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, juanvallejo

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

Needs approval from an approver in each of these OWNERS Files:

• vendor/k8s.io/kubernetes/hack/OWNERS [deads2k]
• vendor/k8s.io/kubernetes/pkg/registry/OWNERS [deads2k]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

[deads2k]

@smarterclayton @stevekuznetsov I don't see the gcp job in prow. Am I just missing it?

[smarterclayton]

/retest

[openshift-merge-robot]

Automatic merge from submit-queue.

[juanvallejo]

/cherrypick release-3.7

[openshift-cherrypick-robot]

@juanvallejo: #18219 failed to apply on top of branch "release-3.7":

Using index info to reconstruct a base tree...
A	vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
M	vendor/k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage/storage.go
M	vendor/k8s.io/kubernetes/pkg/registry/extensions/deployment/storage/storage.go
M	vendor/k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage/storage.go
M	vendor/k8s.io/kubernetes/pkg/registry/extensions/rest/storage_extensions.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/k8s.io/kubernetes/pkg/registry/extensions/rest/storage_extensions.go
Auto-merging vendor/k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage/storage.go
Auto-merging vendor/k8s.io/kubernetes/pkg/registry/extensions/deployment/storage/storage.go
Auto-merging vendor/k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage/storage.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage/storage.go
Auto-merging cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
CONFLICT (content): Merge conflict in cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
error: Failed to merge in the changes.
Patch failed at 0001 UPSTREAM: 58301: Limit all category to apps group for ds/deployment/replicaset

In response to this:

/cherrypick release-3.7

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.