Skip to content

Commit 7ed6862

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #17454 from fabianofranz/release-3.7
Automatic merge from submit-queue. [3.7] UPSTREAM: 49128: add svc and netpol to discovery Fixes #17411 and https://bugzilla.redhat.com/show_bug.cgi?id=1515878 Add svc and netpol to discovery, picking kubernetes/kubernetes@8232778 into the **enterprise-3.7** branch. PTAL @deads2k @smarterclayton
2 parents 06970e6 + cb413eb commit 7ed6862

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

‎vendor/k8s.io/kubernetes/pkg/registry/core/service/rest.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage/BUILD

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage/storage.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)