Merge pull request #20721 from pweil-/disable-psp

pkg/apis/extensions/v1beta1/types.go

@@ -938,7 +938,7 @@ type PodSecurityPolicy struct {
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	v1.ObjectMeta `json:"metadata,omitempty"`
 
-	// Spec defines the policy enforced.
+	// spec defines the policy enforced.
 	Spec PodSecurityPolicySpec `json:"spec,omitempty"`
 }
 

pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go

@@ -497,7 +497,7 @@ func (NodeUtilization) SwaggerDoc() map[string]string {
 var map_PodSecurityPolicy = map[string]string{
 	"":         "Pod Security Policy governs the ability to make requests that affect the Security Context that will be applied to a pod and container.",
 	"metadata": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
-	"spec":     "Spec defines the policy enforced.",
+	"spec":     "spec defines the policy enforced.",
 }
 
 func (PodSecurityPolicy) SwaggerDoc() map[string]string {

pkg/master/master.go

@@ -574,7 +574,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
 // getExperimentalResources returns the resources for extenstions api
 func (m *Master) getExtensionResources(c *Config) map[string]rest.Storage {
 	// All resources except these are disabled by default.
-	enabledResources := sets.NewString("horizontalpodautoscalers", "ingresses", "jobs", "podsecuritypolicy", "replicasets")
+	enabledResources := sets.NewString("horizontalpodautoscalers", "ingresses", "jobs", "replicasets")
 	resourceOverrides := m.ApiGroupVersionOverrides["extensions/v1beta1"].ResourceOverrides
 	isEnabled := func(resource string) bool {
 		// Check if the resource has been overriden.