Merge pull request #61608 from php-coder/psp_move_internal_types_to_policy

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. PSP: move internal types to policy API group **What this PR does / why we need it**: This is a part of the PSP migration from extensions to policy API group. This PR moves internal types to the its final destination. **Which issue(s) this PR fixes**: Addressed to https://github.com/kubernetes/features/issues/5
2018-04-13 05:22:24 -07:00
parent 4b26d70daf 6767e233ed
commit 71e00a6b8e
87 changed files with 2368 additions and 2355 deletions
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD
@@ -15,7 +15,6 @@ go_library(
        "extensions_client.go",
        "generated_expansion.go",
        "ingress.go",
-        "podsecuritypolicy.go",
        "replicaset.go",
    ],
    importpath = "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion",
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go
@@ -28,7 +28,6 @@ type ExtensionsInterface interface {
 	DaemonSetsGetter
 	DeploymentsGetter
 	IngressesGetter
-	PodSecurityPoliciesGetter
 	ReplicaSetsGetter
 }

@@ -49,10 +48,6 @@ func (c *ExtensionsClient) Ingresses(namespace string) IngressInterface {
 	return newIngresses(c, namespace)
 }

-func (c *ExtensionsClient) PodSecurityPolicies() PodSecurityPolicyInterface {
-	return newPodSecurityPolicies(c)
-}
-
 func (c *ExtensionsClient) ReplicaSets(namespace string) ReplicaSetInterface {
 	return newReplicaSets(c, namespace)
 }
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD
@@ -14,7 +14,6 @@ go_library(
        "fake_deployment_expansion.go",
        "fake_extensions_client.go",
        "fake_ingress.go",
-        "fake_podsecuritypolicy.go",
        "fake_replicaset.go",
    ],
    importpath = "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake",
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go
@@ -40,10 +40,6 @@ func (c *FakeExtensions) Ingresses(namespace string) internalversion.IngressInte
 	return &FakeIngresses{c, namespace}
 }

-func (c *FakeExtensions) PodSecurityPolicies() internalversion.PodSecurityPolicyInterface {
-	return &FakePodSecurityPolicies{c}
-}
-
 func (c *FakeExtensions) ReplicaSets(namespace string) internalversion.ReplicaSetInterface {
 	return &FakeReplicaSets{c, namespace}
 }
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/generated_expansion.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/generated_expansion.go
@@ -22,6 +22,4 @@ type DaemonSetExpansion interface{}

 type IngressExpansion interface{}

-type PodSecurityPolicyExpansion interface{}
-
 type ReplicaSetExpansion interface{}
--- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD
+++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD
@@ -13,6 +13,7 @@ go_library(
        "eviction_expansion.go",
        "generated_expansion.go",
        "poddisruptionbudget.go",
+        "podsecuritypolicy.go",
        "policy_client.go",
    ],
    importpath = "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion",
--- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD
+++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD
@@ -12,6 +12,7 @@ go_library(
        "fake_eviction.go",
        "fake_eviction_expansion.go",
        "fake_poddisruptionbudget.go",
+        "fake_podsecuritypolicy.go",
        "fake_policy_client.go",
    ],
    importpath = "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake",
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go
@@ -25,32 +25,32 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	testing "k8s.io/client-go/testing"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
+	policy "k8s.io/kubernetes/pkg/apis/policy"
 )

 // FakePodSecurityPolicies implements PodSecurityPolicyInterface
 type FakePodSecurityPolicies struct {
-	Fake *FakeExtensions
+	Fake *FakePolicy
 }

-var podsecuritypoliciesResource = schema.GroupVersionResource{Group: "extensions", Version: "", Resource: "podsecuritypolicies"}
+var podsecuritypoliciesResource = schema.GroupVersionResource{Group: "policy", Version: "", Resource: "podsecuritypolicies"}

-var podsecuritypoliciesKind = schema.GroupVersionKind{Group: "extensions", Version: "", Kind: "PodSecurityPolicy"}
+var podsecuritypoliciesKind = schema.GroupVersionKind{Group: "policy", Version: "", Kind: "PodSecurityPolicy"}

 // Get takes name of the podSecurityPolicy, and returns the corresponding podSecurityPolicy object, and an error if there is any.
-func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (result *extensions.PodSecurityPolicy, err error) {
+func (c *FakePodSecurityPolicies) Get(name string, options v1.GetOptions) (result *policy.PodSecurityPolicy, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewRootGetAction(podsecuritypoliciesResource, name), &extensions.PodSecurityPolicy{})
+		Invokes(testing.NewRootGetAction(podsecuritypoliciesResource, name), &policy.PodSecurityPolicy{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*extensions.PodSecurityPolicy), err
+	return obj.(*policy.PodSecurityPolicy), err
 }

 // List takes label and field selectors, and returns the list of PodSecurityPolicies that match those selectors.
-func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *extensions.PodSecurityPolicyList, err error) {
+func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *policy.PodSecurityPolicyList, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewRootListAction(podsecuritypoliciesResource, podsecuritypoliciesKind, opts), &extensions.PodSecurityPolicyList{})
+		Invokes(testing.NewRootListAction(podsecuritypoliciesResource, podsecuritypoliciesKind, opts), &policy.PodSecurityPolicyList{})
 	if obj == nil {
 		return nil, err
 	}
@@ -59,8 +59,8 @@ func (c *FakePodSecurityPolicies) List(opts v1.ListOptions) (result *extensions.
 	if label == nil {
 		label = labels.Everything()
 	}
-	list := &extensions.PodSecurityPolicyList{}
-	for _, item := range obj.(*extensions.PodSecurityPolicyList).Items {
+	list := &policy.PodSecurityPolicyList{}
+	for _, item := range obj.(*policy.PodSecurityPolicyList).Items {
 		if label.Matches(labels.Set(item.Labels)) {
 			list.Items = append(list.Items, item)
 		}
@@ -75,29 +75,29 @@ func (c *FakePodSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, e
 }

 // Create takes the representation of a podSecurityPolicy and creates it.  Returns the server's representation of the podSecurityPolicy, and an error, if there is any.
-func (c *FakePodSecurityPolicies) Create(podSecurityPolicy *extensions.PodSecurityPolicy) (result *extensions.PodSecurityPolicy, err error) {
+func (c *FakePodSecurityPolicies) Create(podSecurityPolicy *policy.PodSecurityPolicy) (result *policy.PodSecurityPolicy, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewRootCreateAction(podsecuritypoliciesResource, podSecurityPolicy), &extensions.PodSecurityPolicy{})
+		Invokes(testing.NewRootCreateAction(podsecuritypoliciesResource, podSecurityPolicy), &policy.PodSecurityPolicy{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*extensions.PodSecurityPolicy), err
+	return obj.(*policy.PodSecurityPolicy), err
 }

 // Update takes the representation of a podSecurityPolicy and updates it. Returns the server's representation of the podSecurityPolicy, and an error, if there is any.
-func (c *FakePodSecurityPolicies) Update(podSecurityPolicy *extensions.PodSecurityPolicy) (result *extensions.PodSecurityPolicy, err error) {
+func (c *FakePodSecurityPolicies) Update(podSecurityPolicy *policy.PodSecurityPolicy) (result *policy.PodSecurityPolicy, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewRootUpdateAction(podsecuritypoliciesResource, podSecurityPolicy), &extensions.PodSecurityPolicy{})
+		Invokes(testing.NewRootUpdateAction(podsecuritypoliciesResource, podSecurityPolicy), &policy.PodSecurityPolicy{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*extensions.PodSecurityPolicy), err
+	return obj.(*policy.PodSecurityPolicy), err
 }

 // Delete takes name of the podSecurityPolicy and deletes it. Returns an error if one occurs.
 func (c *FakePodSecurityPolicies) Delete(name string, options *v1.DeleteOptions) error {
 	_, err := c.Fake.
-		Invokes(testing.NewRootDeleteAction(podsecuritypoliciesResource, name), &extensions.PodSecurityPolicy{})
+		Invokes(testing.NewRootDeleteAction(podsecuritypoliciesResource, name), &policy.PodSecurityPolicy{})
 	return err
 }

@@ -105,16 +105,16 @@ func (c *FakePodSecurityPolicies) Delete(name string, options *v1.DeleteOptions)
 func (c *FakePodSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
 	action := testing.NewRootDeleteCollectionAction(podsecuritypoliciesResource, listOptions)

-	_, err := c.Fake.Invokes(action, &extensions.PodSecurityPolicyList{})
+	_, err := c.Fake.Invokes(action, &policy.PodSecurityPolicyList{})
 	return err
 }

 // Patch applies the patch and returns the patched podSecurityPolicy.
-func (c *FakePodSecurityPolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.PodSecurityPolicy, err error) {
+func (c *FakePodSecurityPolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *policy.PodSecurityPolicy, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewRootPatchSubresourceAction(podsecuritypoliciesResource, name, data, subresources...), &extensions.PodSecurityPolicy{})
+		Invokes(testing.NewRootPatchSubresourceAction(podsecuritypoliciesResource, name, data, subresources...), &policy.PodSecurityPolicy{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*extensions.PodSecurityPolicy), err
+	return obj.(*policy.PodSecurityPolicy), err
 }
--- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go
@@ -36,6 +36,10 @@ func (c *FakePolicy) PodDisruptionBudgets(namespace string) internalversion.PodD
 	return &FakePodDisruptionBudgets{c, namespace}
 }

+func (c *FakePolicy) PodSecurityPolicies() internalversion.PodSecurityPolicyInterface {
+	return &FakePodSecurityPolicies{c}
+}
+
 // RESTClient returns a RESTClient that is used to communicate
 // with API server by this client implementation.
 func (c *FakePolicy) RESTClient() rest.Interface {
--- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/generated_expansion.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/generated_expansion.go
@@ -19,3 +19,5 @@ limitations under the License.
 package internalversion

 type PodDisruptionBudgetExpansion interface{}
+
+type PodSecurityPolicyExpansion interface{}
--- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go
@@ -23,7 +23,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
+	policy "k8s.io/kubernetes/pkg/apis/policy"
 	scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme"
 )

@@ -35,14 +35,14 @@ type PodSecurityPoliciesGetter interface {

 // PodSecurityPolicyInterface has methods to work with PodSecurityPolicy resources.
 type PodSecurityPolicyInterface interface {
-	Create(*extensions.PodSecurityPolicy) (*extensions.PodSecurityPolicy, error)
-	Update(*extensions.PodSecurityPolicy) (*extensions.PodSecurityPolicy, error)
+	Create(*policy.PodSecurityPolicy) (*policy.PodSecurityPolicy, error)
+	Update(*policy.PodSecurityPolicy) (*policy.PodSecurityPolicy, error)
 	Delete(name string, options *v1.DeleteOptions) error
 	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
-	Get(name string, options v1.GetOptions) (*extensions.PodSecurityPolicy, error)
-	List(opts v1.ListOptions) (*extensions.PodSecurityPolicyList, error)
+	Get(name string, options v1.GetOptions) (*policy.PodSecurityPolicy, error)
+	List(opts v1.ListOptions) (*policy.PodSecurityPolicyList, error)
 	Watch(opts v1.ListOptions) (watch.Interface, error)
-	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.PodSecurityPolicy, err error)
+	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *policy.PodSecurityPolicy, err error)
 	PodSecurityPolicyExpansion
 }

@@ -52,15 +52,15 @@ type podSecurityPolicies struct {
 }

 // newPodSecurityPolicies returns a PodSecurityPolicies
-func newPodSecurityPolicies(c *ExtensionsClient) *podSecurityPolicies {
+func newPodSecurityPolicies(c *PolicyClient) *podSecurityPolicies {
 	return &podSecurityPolicies{
 		client: c.RESTClient(),
 	}
 }

 // Get takes name of the podSecurityPolicy, and returns the corresponding podSecurityPolicy object, and an error if there is any.
-func (c *podSecurityPolicies) Get(name string, options v1.GetOptions) (result *extensions.PodSecurityPolicy, err error) {
-	result = &extensions.PodSecurityPolicy{}
+func (c *podSecurityPolicies) Get(name string, options v1.GetOptions) (result *policy.PodSecurityPolicy, err error) {
+	result = &policy.PodSecurityPolicy{}
 	err = c.client.Get().
 		Resource("podsecuritypolicies").
 		Name(name).
@@ -71,8 +71,8 @@ func (c *podSecurityPolicies) Get(name string, options v1.GetOptions) (result *e
 }

 // List takes label and field selectors, and returns the list of PodSecurityPolicies that match those selectors.
-func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *extensions.PodSecurityPolicyList, err error) {
-	result = &extensions.PodSecurityPolicyList{}
+func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *policy.PodSecurityPolicyList, err error) {
+	result = &policy.PodSecurityPolicyList{}
 	err = c.client.Get().
 		Resource("podsecuritypolicies").
 		VersionedParams(&opts, scheme.ParameterCodec).
@@ -91,8 +91,8 @@ func (c *podSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error
 }

 // Create takes the representation of a podSecurityPolicy and creates it.  Returns the server's representation of the podSecurityPolicy, and an error, if there is any.
-func (c *podSecurityPolicies) Create(podSecurityPolicy *extensions.PodSecurityPolicy) (result *extensions.PodSecurityPolicy, err error) {
-	result = &extensions.PodSecurityPolicy{}
+func (c *podSecurityPolicies) Create(podSecurityPolicy *policy.PodSecurityPolicy) (result *policy.PodSecurityPolicy, err error) {
+	result = &policy.PodSecurityPolicy{}
 	err = c.client.Post().
 		Resource("podsecuritypolicies").
 		Body(podSecurityPolicy).
@@ -102,8 +102,8 @@ func (c *podSecurityPolicies) Create(podSecurityPolicy *extensions.PodSecurityPo
 }

 // Update takes the representation of a podSecurityPolicy and updates it. Returns the server's representation of the podSecurityPolicy, and an error, if there is any.
-func (c *podSecurityPolicies) Update(podSecurityPolicy *extensions.PodSecurityPolicy) (result *extensions.PodSecurityPolicy, err error) {
-	result = &extensions.PodSecurityPolicy{}
+func (c *podSecurityPolicies) Update(podSecurityPolicy *policy.PodSecurityPolicy) (result *policy.PodSecurityPolicy, err error) {
+	result = &policy.PodSecurityPolicy{}
 	err = c.client.Put().
 		Resource("podsecuritypolicies").
 		Name(podSecurityPolicy.Name).
@@ -134,8 +134,8 @@ func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOp
 }

 // Patch applies the patch and returns the patched podSecurityPolicy.
-func (c *podSecurityPolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.PodSecurityPolicy, err error) {
-	result = &extensions.PodSecurityPolicy{}
+func (c *podSecurityPolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *policy.PodSecurityPolicy, err error) {
+	result = &policy.PodSecurityPolicy{}
 	err = c.client.Patch(pt).
 		Resource("podsecuritypolicies").
 		SubResource(subresources...).
--- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go
+++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go
@@ -27,6 +27,7 @@ type PolicyInterface interface {
 	RESTClient() rest.Interface
 	EvictionsGetter
 	PodDisruptionBudgetsGetter
+	PodSecurityPoliciesGetter
 }

 // PolicyClient is used to interact with features provided by the policy group.
@@ -42,6 +43,10 @@ func (c *PolicyClient) PodDisruptionBudgets(namespace string) PodDisruptionBudge
 	return newPodDisruptionBudgets(c, namespace)
 }

+func (c *PolicyClient) PodSecurityPolicies() PodSecurityPolicyInterface {
+	return newPodSecurityPolicies(c)
+}
+
 // NewForConfig creates a new PolicyClient for the given config.
 func NewForConfig(c *rest.Config) (*PolicyClient, error) {
 	config := *c
--- a/pkg/client/informers/informers_generated/internalversion/extensions/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/internalversion/extensions/internalversion/BUILD
@@ -12,7 +12,6 @@ go_library(
        "deployment.go",
        "ingress.go",
        "interface.go",
-        "podsecuritypolicy.go",
        "replicaset.go",
    ],
    importpath = "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/extensions/internalversion",
--- a/pkg/client/informers/informers_generated/internalversion/extensions/internalversion/interface.go
+++ b/pkg/client/informers/informers_generated/internalversion/extensions/internalversion/interface.go
@@ -30,8 +30,6 @@ type Interface interface {
 	Deployments() DeploymentInformer
 	// Ingresses returns a IngressInformer.
 	Ingresses() IngressInformer
-	// PodSecurityPolicies returns a PodSecurityPolicyInformer.
-	PodSecurityPolicies() PodSecurityPolicyInformer
 	// ReplicaSets returns a ReplicaSetInformer.
 	ReplicaSets() ReplicaSetInformer
 }
@@ -62,11 +60,6 @@ func (v *version) Ingresses() IngressInformer {
 	return &ingressInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
 }

-// PodSecurityPolicies returns a PodSecurityPolicyInformer.
-func (v *version) PodSecurityPolicies() PodSecurityPolicyInformer {
-	return &podSecurityPolicyInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
-}
-
 // ReplicaSets returns a ReplicaSetInformer.
 func (v *version) ReplicaSets() ReplicaSetInformer {
 	return &replicaSetInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
--- a/pkg/client/informers/informers_generated/internalversion/generic.go
+++ b/pkg/client/informers/informers_generated/internalversion/generic.go
@@ -133,8 +133,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().Deployments().Informer()}, nil
 	case extensions.SchemeGroupVersion.WithResource("ingresses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().Ingresses().Informer()}, nil
-	case extensions.SchemeGroupVersion.WithResource("podsecuritypolicies"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().PodSecurityPolicies().Informer()}, nil
 	case extensions.SchemeGroupVersion.WithResource("replicasets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Extensions().InternalVersion().ReplicaSets().Informer()}, nil

@@ -145,6 +143,8 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 		// Group=policy, Version=internalVersion
 	case policy.SchemeGroupVersion.WithResource("poddisruptionbudgets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().InternalVersion().PodDisruptionBudgets().Informer()}, nil
+	case policy.SchemeGroupVersion.WithResource("podsecuritypolicies"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().InternalVersion().PodSecurityPolicies().Informer()}, nil

 		// Group=rbac.authorization.k8s.io, Version=internalVersion
 	case rbac.SchemeGroupVersion.WithResource("clusterroles"):
--- a/pkg/client/informers/informers_generated/internalversion/policy/internalversion/BUILD
+++ b/pkg/client/informers/informers_generated/internalversion/policy/internalversion/BUILD
@@ -10,6 +10,7 @@ go_library(
    srcs = [
        "interface.go",
        "poddisruptionbudget.go",
+        "podsecuritypolicy.go",
    ],
    importpath = "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/policy/internalversion",
    deps = [
--- a/pkg/client/informers/informers_generated/internalversion/policy/internalversion/interface.go
+++ b/pkg/client/informers/informers_generated/internalversion/policy/internalversion/interface.go
@@ -26,6 +26,8 @@ import (
 type Interface interface {
 	// PodDisruptionBudgets returns a PodDisruptionBudgetInformer.
 	PodDisruptionBudgets() PodDisruptionBudgetInformer
+	// PodSecurityPolicies returns a PodSecurityPolicyInformer.
+	PodSecurityPolicies() PodSecurityPolicyInformer
 }

 type version struct {
@@ -43,3 +45,8 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList
 func (v *version) PodDisruptionBudgets() PodDisruptionBudgetInformer {
 	return &podDisruptionBudgetInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
 }
+
+// PodSecurityPolicies returns a PodSecurityPolicyInformer.
+func (v *version) PodSecurityPolicies() PodSecurityPolicyInformer {
+	return &podSecurityPolicyInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
+}
--- a/pkg/client/informers/informers_generated/internalversion/extensions/internalversion/podsecuritypolicy.go
+++ b/pkg/client/informers/informers_generated/internalversion/extensions/internalversion/podsecuritypolicy.go
@@ -25,10 +25,10 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
+	policy "k8s.io/kubernetes/pkg/apis/policy"
 	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/internalinterfaces"
-	internalversion "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion"
+	internalversion "k8s.io/kubernetes/pkg/client/listers/policy/internalversion"
 )

 // PodSecurityPolicyInformer provides access to a shared informer and lister for
@@ -60,16 +60,16 @@ func NewFilteredPodSecurityPolicyInformer(client internalclientset.Interface, re
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.Extensions().PodSecurityPolicies().List(options)
+				return client.Policy().PodSecurityPolicies().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.Extensions().PodSecurityPolicies().Watch(options)
+				return client.Policy().PodSecurityPolicies().Watch(options)
 			},
 		},
-		&extensions.PodSecurityPolicy{},
+		&policy.PodSecurityPolicy{},
 		resyncPeriod,
 		indexers,
 	)
@@ -80,7 +80,7 @@ func (f *podSecurityPolicyInformer) defaultInformer(client internalclientset.Int
 }

 func (f *podSecurityPolicyInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&extensions.PodSecurityPolicy{}, f.defaultInformer)
+	return f.factory.InformerFor(&policy.PodSecurityPolicy{}, f.defaultInformer)
 }

 func (f *podSecurityPolicyInformer) Lister() internalversion.PodSecurityPolicyLister {
--- a/pkg/client/listers/extensions/internalversion/BUILD
+++ b/pkg/client/listers/extensions/internalversion/BUILD
@@ -15,7 +15,6 @@ go_library(
        "deployment_expansion.go",
        "expansion_generated.go",
        "ingress.go",
-        "podsecuritypolicy.go",
        "replicaset.go",
        "replicaset_expansion.go",
    ],
--- a/pkg/client/listers/extensions/internalversion/expansion_generated.go
+++ b/pkg/client/listers/extensions/internalversion/expansion_generated.go
@@ -25,7 +25,3 @@ type IngressListerExpansion interface{}
 // IngressNamespaceListerExpansion allows custom methods to be added to
 // IngressNamespaceLister.
 type IngressNamespaceListerExpansion interface{}
-
-// PodSecurityPolicyListerExpansion allows custom methods to be added to
-// PodSecurityPolicyLister.
-type PodSecurityPolicyListerExpansion interface{}
--- a/pkg/client/listers/policy/internalversion/BUILD
+++ b/pkg/client/listers/policy/internalversion/BUILD
@@ -12,6 +12,7 @@ go_library(
        "expansion_generated.go",
        "poddisruptionbudget.go",
        "poddisruptionbudget_expansion.go",
+        "podsecuritypolicy.go",
    ],
    importpath = "k8s.io/kubernetes/pkg/client/listers/policy/internalversion",
    deps = [
--- a/pkg/client/listers/policy/internalversion/expansion_generated.go
+++ b/pkg/client/listers/policy/internalversion/expansion_generated.go
@@ -25,3 +25,7 @@ type EvictionListerExpansion interface{}
 // EvictionNamespaceListerExpansion allows custom methods to be added to
 // EvictionNamespaceLister.
 type EvictionNamespaceListerExpansion interface{}
+
+// PodSecurityPolicyListerExpansion allows custom methods to be added to
+// PodSecurityPolicyLister.
+type PodSecurityPolicyListerExpansion interface{}
--- a/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go
+++ b/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go
@@ -22,15 +22,15 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions"
+	policy "k8s.io/kubernetes/pkg/apis/policy"
 )

 // PodSecurityPolicyLister helps list PodSecurityPolicies.
 type PodSecurityPolicyLister interface {
 	// List lists all PodSecurityPolicies in the indexer.
-	List(selector labels.Selector) (ret []*extensions.PodSecurityPolicy, err error)
+	List(selector labels.Selector) (ret []*policy.PodSecurityPolicy, err error)
 	// Get retrieves the PodSecurityPolicy from the index for a given name.
-	Get(name string) (*extensions.PodSecurityPolicy, error)
+	Get(name string) (*policy.PodSecurityPolicy, error)
 	PodSecurityPolicyListerExpansion
 }

@@ -45,21 +45,21 @@ func NewPodSecurityPolicyLister(indexer cache.Indexer) PodSecurityPolicyLister {
 }

 // List lists all PodSecurityPolicies in the indexer.
-func (s *podSecurityPolicyLister) List(selector labels.Selector) (ret []*extensions.PodSecurityPolicy, err error) {
+func (s *podSecurityPolicyLister) List(selector labels.Selector) (ret []*policy.PodSecurityPolicy, err error) {
 	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
-		ret = append(ret, m.(*extensions.PodSecurityPolicy))
+		ret = append(ret, m.(*policy.PodSecurityPolicy))
 	})
 	return ret, err
 }

 // Get retrieves the PodSecurityPolicy from the index for a given name.
-func (s *podSecurityPolicyLister) Get(name string) (*extensions.PodSecurityPolicy, error) {
+func (s *podSecurityPolicyLister) Get(name string) (*policy.PodSecurityPolicy, error) {
 	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.NewNotFound(extensions.Resource("podsecuritypolicy"), name)
+		return nil, errors.NewNotFound(policy.Resource("podsecuritypolicy"), name)
 	}
-	return obj.(*extensions.PodSecurityPolicy), nil
+	return obj.(*policy.PodSecurityPolicy), nil
 }