From 126716287b24a993e6fa1beafca4c49d3d253d09 Mon Sep 17 00:00:00 2001 From: yue9944882 <291271447@qq.com> Date: Tue, 10 Jul 2018 16:17:10 +0800 Subject: [PATCH] clean ups --- plugin/pkg/admission/podpreset/BUILD | 2 -- plugin/pkg/admission/podpreset/admission.go | 24 --------------------- 2 files changed, 26 deletions(-) diff --git a/plugin/pkg/admission/podpreset/BUILD b/plugin/pkg/admission/podpreset/BUILD index b7652bed361..34329ea7228 100644 --- a/plugin/pkg/admission/podpreset/BUILD +++ b/plugin/pkg/admission/podpreset/BUILD @@ -29,8 +29,6 @@ go_library( srcs = ["admission.go"], importpath = "k8s.io/kubernetes/plugin/pkg/admission/podpreset", deps = [ - "//pkg/api/legacyscheme:go_default_library", - "//pkg/api/ref:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/settings:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", diff --git a/plugin/pkg/admission/podpreset/admission.go b/plugin/pkg/admission/podpreset/admission.go index 5c5df6579c8..782a832f6ea 100644 --- a/plugin/pkg/admission/podpreset/admission.go +++ b/plugin/pkg/admission/podpreset/admission.go @@ -29,8 +29,6 @@ import ( "k8s.io/apimachinery/pkg/labels" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/admission" - "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/api/ref" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/settings" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -347,28 +345,6 @@ func mergeVolumes(volumes []api.Volume, podPresets []*settings.PodPreset) ([]api return mergedVolumes, err } -func (c *podPresetPlugin) addEvent(pod *api.Pod, pip *settings.PodPreset, message string) { - ref, err := ref.GetReference(legacyscheme.Scheme, pod) - if err != nil { - glog.Errorf("pip %s: get reference for pod %s failed: %v", pip.GetName(), pod.GetName(), err) - return - } - - e := &api.Event{ - InvolvedObject: *ref, - Message: message, - Source: api.EventSource{ - Component: fmt.Sprintf("pip %s", pip.GetName()), - }, - Type: "Warning", - } - - if _, err := c.client.Core().Events(pod.GetNamespace()).Create(e); err != nil { - glog.Errorf("pip %s: creating pod event failed: %v", pip.GetName(), err) - return - } -} - // applyPodPresetsOnPod updates the PodSpec with merged information from all the // applicable PodPresets. It ignores the errors of merge functions because merge // errors have already been checked in safeToApplyPodPresetsOnPod function.