Merge pull request #46988 from p0lyn0mial/rename_some_admission_pkg

Automatic merge from submit-queue (batch tested with PRs 46718, 46828, 46988)

Simply changed the names of packages of some admission plugins.

**What this PR does / why we need it**:
This PR simply changes the names of packages of some admission plugins so that they are not in conflict with admission pkg.

**Release note**:

```release-note
NONE
```

cmd/kube-apiserver/app/BUILD

@@ -67,7 +67,7 @@ go_library(
         "//plugin/pkg/admission/security/podsecuritypolicy:go_default_library",
         "//plugin/pkg/admission/securitycontext/scdeny:go_default_library",
         "//plugin/pkg/admission/serviceaccount:go_default_library",
-        "//plugin/pkg/admission/storageclass/default:go_default_library",
+        "//plugin/pkg/admission/storageclass/setdefault:go_default_library",
         "//plugin/pkg/admission/webhook:go_default_library",
         "//plugin/pkg/auth/authenticator/token/bootstrap:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",

cmd/kube-apiserver/app/plugins.go

@@ -38,16 +38,16 @@ import (
 	"k8s.io/kubernetes/plugin/pkg/admission/limitranger"
 	"k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision"
 	"k8s.io/kubernetes/plugin/pkg/admission/namespace/exists"
-	noderestriction "k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
+	"k8s.io/kubernetes/plugin/pkg/admission/noderestriction"
 	"k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label"
 	"k8s.io/kubernetes/plugin/pkg/admission/podnodeselector"
-	podpreset "k8s.io/kubernetes/plugin/pkg/admission/podpreset"
+	"k8s.io/kubernetes/plugin/pkg/admission/podpreset"
 	"k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction"
 	"k8s.io/kubernetes/plugin/pkg/admission/resourcequota"
-	podsecuritypolicy "k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy"
+	"k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy"
 	"k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny"
 	"k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
-	storagedefault "k8s.io/kubernetes/plugin/pkg/admission/storageclass/default"
+	"k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
 	"k8s.io/kubernetes/plugin/pkg/admission/webhook"
 )
 
@@ -75,6 +75,6 @@ func registerAllAdmissionPlugins(plugins *admission.Plugins) {
 	podsecuritypolicy.Register(plugins)
 	scdeny.Register(plugins)
 	serviceaccount.Register(plugins)
-	storagedefault.Register(plugins)
+	setdefault.Register(plugins)
 	webhook.Register(plugins)
 }

plugin/BUILD

@@ -36,7 +36,7 @@ filegroup(
         "//plugin/pkg/admission/security:all-srcs",
         "//plugin/pkg/admission/securitycontext/scdeny:all-srcs",
         "//plugin/pkg/admission/serviceaccount:all-srcs",
-        "//plugin/pkg/admission/storageclass/default:all-srcs",
+        "//plugin/pkg/admission/storageclass/setdefault:all-srcs",
         "//plugin/pkg/admission/webhook:all-srcs",
         "//plugin/pkg/auth:all-srcs",
         "//plugin/pkg/scheduler:all-srcs",

plugin/pkg/admission/podpreset/admission.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package admission
+package podpreset
 
 import (
 	"fmt"

plugin/pkg/admission/podpreset/admission_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package admission
+package podpreset
 
 import (
 	"reflect"

plugin/pkg/admission/security/podsecuritypolicy/admission.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package admission
+package podsecuritypolicy
 
 import (
 	"fmt"

plugin/pkg/admission/security/podsecuritypolicy/admission_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package admission
+package podsecuritypolicy
 
 import (
 	"fmt"

plugin/pkg/admission/storageclass/setdefault/admission.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package admission
+package setdefault
 
 import (
 	"fmt"

plugin/pkg/admission/storageclass/setdefault/admission_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package admission
+package setdefault
 
 import (
 	"testing"