diff --git a/hack/.golint_failures b/hack/.golint_failures index 00b0b175e44..b304770dc73 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -416,7 +416,6 @@ plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1 plugin/pkg/admission/security plugin/pkg/admission/security/podsecuritypolicy plugin/pkg/admission/serviceaccount -plugin/pkg/admission/storageclass/setdefault plugin/pkg/auth/authorizer/node plugin/pkg/auth/authorizer/rbac staging/src/k8s.io/api/admission/v1beta1 diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD index 65d3dcfc755..b4fae4a1541 100644 --- a/pkg/kubeapiserver/options/BUILD +++ b/pkg/kubeapiserver/options/BUILD @@ -52,8 +52,8 @@ 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/storage/storageclass/setdefault:go_default_library", "//plugin/pkg/admission/storage/storageobjectinuseprotection:go_default_library", - "//plugin/pkg/admission/storageclass/setdefault:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/pborman/uuid:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/pkg/kubeapiserver/options/plugins.go b/pkg/kubeapiserver/options/plugins.go index f3d50f03793..75095b20d1f 100644 --- a/pkg/kubeapiserver/options/plugins.go +++ b/pkg/kubeapiserver/options/plugins.go @@ -49,8 +49,8 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy" "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny" "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" + "k8s.io/kubernetes/plugin/pkg/admission/storage/storageclass/setdefault" "k8s.io/kubernetes/plugin/pkg/admission/storage/storageobjectinuseprotection" - "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" diff --git a/plugin/pkg/admission/storage/storageclass/setdefault/admission.go b/plugin/pkg/admission/storage/storageclass/setdefault/admission.go index 6a9fe197a08..70281518821 100644 --- a/plugin/pkg/admission/storage/storageclass/setdefault/admission.go +++ b/plugin/pkg/admission/storage/storageclass/setdefault/admission.go @@ -35,6 +35,7 @@ import ( ) const ( + // PluginName is the name of this admission controller plugin PluginName = "DefaultStorageClass" ) @@ -84,16 +85,16 @@ func (a *claimDefaulterPlugin) ValidateInitialization() error { // 1. Find available StorageClasses. // 2. Figure which is the default // 3. Write to the PVClaim -func (c *claimDefaulterPlugin) Admit(a admission.Attributes) error { - if a.GetResource().GroupResource() != api.Resource("persistentvolumeclaims") { +func (a *claimDefaulterPlugin) Admit(attr admission.Attributes) error { + if attr.GetResource().GroupResource() != api.Resource("persistentvolumeclaims") { return nil } - if len(a.GetSubresource()) != 0 { + if len(attr.GetSubresource()) != 0 { return nil } - pvc, ok := a.GetObject().(*api.PersistentVolumeClaim) + pvc, ok := attr.GetObject().(*api.PersistentVolumeClaim) // if we can't convert then we don't handle this object so just return if !ok { return nil @@ -106,9 +107,9 @@ func (c *claimDefaulterPlugin) Admit(a admission.Attributes) error { glog.V(4).Infof("no storage class for claim %s (generate: %s)", pvc.Name, pvc.GenerateName) - def, err := getDefaultClass(c.lister) + def, err := getDefaultClass(a.lister) if err != nil { - return admission.NewForbidden(a, err) + return admission.NewForbidden(attr, err) } if def == nil { // No default class selected, do nothing about the PVC.