From fc78e5ce9e671b336cef0780a8b6b1781d2d20c3 Mon Sep 17 00:00:00 2001 From: NickrenREN Date: Thu, 1 Mar 2018 17:55:10 +0800 Subject: [PATCH] fix references and golint failures --- hack/.golint_failures | 1 - pkg/kubeapiserver/options/BUILD | 4 ++-- pkg/kubeapiserver/options/plugins.go | 4 ++-- .../storage/persistentvolume/label/admission.go | 11 +++++++---- .../storage/persistentvolume/label/admission_test.go | 10 +++++----- .../admission/storage/persistentvolume/label/doc.go | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 95a0b7fb99..ea4f898709 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -403,7 +403,6 @@ plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1 plugin/pkg/admission/initialresources plugin/pkg/admission/limitranger plugin/pkg/admission/noderestriction -plugin/pkg/admission/persistentvolume/label plugin/pkg/admission/podnodeselector plugin/pkg/admission/podpreset plugin/pkg/admission/podtolerationrestriction diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD index b4fae4a154..6e411d157a 100644 --- a/pkg/kubeapiserver/options/BUILD +++ b/pkg/kubeapiserver/options/BUILD @@ -42,8 +42,6 @@ go_library( "//plugin/pkg/admission/namespace/autoprovision:go_default_library", "//plugin/pkg/admission/namespace/exists:go_default_library", "//plugin/pkg/admission/noderestriction:go_default_library", - "//plugin/pkg/admission/persistentvolume/label:go_default_library", - "//plugin/pkg/admission/persistentvolume/resize:go_default_library", "//plugin/pkg/admission/podnodeselector:go_default_library", "//plugin/pkg/admission/podpreset:go_default_library", "//plugin/pkg/admission/podtolerationrestriction:go_default_library", @@ -52,6 +50,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/persistentvolume/label:go_default_library", + "//plugin/pkg/admission/storage/persistentvolume/resize:go_default_library", "//plugin/pkg/admission/storage/storageclass/setdefault:go_default_library", "//plugin/pkg/admission/storage/storageobjectinuseprotection:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/kubeapiserver/options/plugins.go b/pkg/kubeapiserver/options/plugins.go index 75095b20d1..f718a7db2b 100644 --- a/pkg/kubeapiserver/options/plugins.go +++ b/pkg/kubeapiserver/options/plugins.go @@ -39,8 +39,6 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision" "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists" "k8s.io/kubernetes/plugin/pkg/admission/noderestriction" - "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label" - "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize" "k8s.io/kubernetes/plugin/pkg/admission/podnodeselector" "k8s.io/kubernetes/plugin/pkg/admission/podpreset" "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction" @@ -49,6 +47,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/persistentvolume/label" + "k8s.io/kubernetes/plugin/pkg/admission/storage/persistentvolume/resize" "k8s.io/kubernetes/plugin/pkg/admission/storage/storageclass/setdefault" "k8s.io/kubernetes/plugin/pkg/admission/storage/storageobjectinuseprotection" diff --git a/plugin/pkg/admission/storage/persistentvolume/label/admission.go b/plugin/pkg/admission/storage/persistentvolume/label/admission.go index 819adae192..19fc962ca3 100644 --- a/plugin/pkg/admission/storage/persistentvolume/label/admission.go +++ b/plugin/pkg/admission/storage/persistentvolume/label/admission.go @@ -33,12 +33,15 @@ import ( vol "k8s.io/kubernetes/pkg/volume" ) -const PluginName = "PersistentVolumeLabel" +const ( + // PluginName is the name of persistent volume label admission plugin + PluginName = "PersistentVolumeLabel" +) // Register registers a plugin func Register(plugins *admission.Plugins) { plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) { - persistentVolumeLabelAdmission := NewPersistentVolumeLabel() + persistentVolumeLabelAdmission := newPersistentVolumeLabel() return persistentVolumeLabelAdmission, nil }) } @@ -57,11 +60,11 @@ type persistentVolumeLabel struct { var _ admission.MutationInterface = &persistentVolumeLabel{} var _ kubeapiserveradmission.WantsCloudConfig = &persistentVolumeLabel{} -// NewPersistentVolumeLabel returns an admission.Interface implementation which adds labels to PersistentVolume CREATE requests, +// newPersistentVolumeLabel returns an admission.Interface implementation which adds labels to PersistentVolume CREATE requests, // based on the labels provided by the underlying cloud provider. // // As a side effect, the cloud provider may block invalid or non-existent volumes. -func NewPersistentVolumeLabel() *persistentVolumeLabel { +func newPersistentVolumeLabel() *persistentVolumeLabel { // DEPRECATED: cloud-controller-manager will now start NewPersistentVolumeLabelController // which does exactly what this admission controller used to do. So once GCE and AWS can // run externally, we can remove this admission controller. diff --git a/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go b/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go index e349c756a4..c8cbc7ff4f 100644 --- a/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go +++ b/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go @@ -56,19 +56,19 @@ func (v *mockVolumes) GetVolumeLabels(volumeName aws.KubernetesVolumeID) (map[st return v.volumeLabels, v.volumeLabelsError } -func (c *mockVolumes) GetDiskPath(volumeName aws.KubernetesVolumeID) (string, error) { +func (v *mockVolumes) GetDiskPath(volumeName aws.KubernetesVolumeID) (string, error) { return "", fmt.Errorf("not implemented") } -func (c *mockVolumes) DiskIsAttached(volumeName aws.KubernetesVolumeID, nodeName types.NodeName) (bool, error) { +func (v *mockVolumes) DiskIsAttached(volumeName aws.KubernetesVolumeID, nodeName types.NodeName) (bool, error) { return false, fmt.Errorf("not implemented") } -func (c *mockVolumes) DisksAreAttached(nodeDisks map[types.NodeName][]aws.KubernetesVolumeID) (map[types.NodeName]map[aws.KubernetesVolumeID]bool, error) { +func (v *mockVolumes) DisksAreAttached(nodeDisks map[types.NodeName][]aws.KubernetesVolumeID) (map[types.NodeName]map[aws.KubernetesVolumeID]bool, error) { return nil, fmt.Errorf("not implemented") } -func (c *mockVolumes) ResizeDisk( +func (v *mockVolumes) ResizeDisk( diskName aws.KubernetesVolumeID, oldSize resource.Quantity, newSize resource.Quantity) (resource.Quantity, error) { @@ -85,7 +85,7 @@ func mockVolumeLabels(labels map[string]string) *mockVolumes { // TestAdmission func TestAdmission(t *testing.T) { - pvHandler := NewPersistentVolumeLabel() + pvHandler := newPersistentVolumeLabel() handler := admission.NewChainHandler(pvHandler) ignoredPV := api.PersistentVolume{ ObjectMeta: metav1.ObjectMeta{Name: "noncloud", Namespace: "myns"}, diff --git a/plugin/pkg/admission/storage/persistentvolume/label/doc.go b/plugin/pkg/admission/storage/persistentvolume/label/doc.go index 5a7b3cfbd3..56d4e627f3 100644 --- a/plugin/pkg/admission/storage/persistentvolume/label/doc.go +++ b/plugin/pkg/admission/storage/persistentvolume/label/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// labels created persistent volumes with zone information +// Package label created persistent volumes with zone information // as provided by the cloud provider package label // import "k8s.io/kubernetes/plugin/pkg/admission/storage/persistentvolume/label"