Fix golint failures in pkg/kubelet/lifecycle

Co-authored-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
This commit is contained in:
Yan Yao 2020-06-06 19:57:21 -07:00
parent e24a42f07b
commit cef7876952
5 changed files with 20 additions and 10 deletions

View File

@ -106,7 +106,6 @@ pkg/kubelet/dockershim/network/hostport
pkg/kubelet/dockershim/network/hostport/testing pkg/kubelet/dockershim/network/hostport/testing
pkg/kubelet/dockershim/network/kubenet pkg/kubelet/dockershim/network/kubenet
pkg/kubelet/dockershim/network/testing pkg/kubelet/dockershim/network/testing
pkg/kubelet/lifecycle
pkg/kubelet/pluginmanager/pluginwatcher pkg/kubelet/pluginmanager/pluginwatcher
pkg/kubelet/pod/testing pkg/kubelet/pod/testing
pkg/kubelet/preemption pkg/kubelet/preemption

View File

@ -26,10 +26,12 @@ type AdmissionFailureHandlerStub struct{}
var _ AdmissionFailureHandler = &AdmissionFailureHandlerStub{} var _ AdmissionFailureHandler = &AdmissionFailureHandlerStub{}
// NewAdmissionFailureHandlerStub returns an instance of AdmissionFailureHandlerStub.
func NewAdmissionFailureHandlerStub() *AdmissionFailureHandlerStub { func NewAdmissionFailureHandlerStub() *AdmissionFailureHandlerStub {
return &AdmissionFailureHandlerStub{} return &AdmissionFailureHandlerStub{}
} }
// HandleAdmissionFailure simply passes admission rejection on, with no special handling.
func (n *AdmissionFailureHandlerStub) HandleAdmissionFailure(admitPod *v1.Pod, failureReasons []PredicateFailureReason) ([]PredicateFailureReason, error) { func (n *AdmissionFailureHandlerStub) HandleAdmissionFailure(admitPod *v1.Pod, failureReasons []PredicateFailureReason) ([]PredicateFailureReason, error) {
return failureReasons, nil return failureReasons, nil
} }

View File

@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Handlers for pod lifecycle events and interfaces to integrate // Package lifecycle contains handlers for pod lifecycle events and interfaces
// with kubelet admission, synchronization, and eviction of pods. // to integrate with kubelet admission, synchronization, and eviction of pods.
package lifecycle // import "k8s.io/kubernetes/pkg/kubelet/lifecycle" package lifecycle // import "k8s.io/kubernetes/pkg/kubelet/lifecycle"

View File

@ -37,7 +37,7 @@ const (
maxRespBodyLength = 10 * 1 << 10 // 10KB maxRespBodyLength = 10 * 1 << 10 // 10KB
) )
type HandlerRunner struct { type handlerRunner struct {
httpGetter kubetypes.HTTPGetter httpGetter kubetypes.HTTPGetter
commandRunner kubecontainer.CommandRunner commandRunner kubecontainer.CommandRunner
containerManager podStatusProvider containerManager podStatusProvider
@ -47,15 +47,16 @@ type podStatusProvider interface {
GetPodStatus(uid types.UID, name, namespace string) (*kubecontainer.PodStatus, error) GetPodStatus(uid types.UID, name, namespace string) (*kubecontainer.PodStatus, error)
} }
// NewHandlerRunner returns a configured lifecycle handler for a container.
func NewHandlerRunner(httpGetter kubetypes.HTTPGetter, commandRunner kubecontainer.CommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner { func NewHandlerRunner(httpGetter kubetypes.HTTPGetter, commandRunner kubecontainer.CommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner {
return &HandlerRunner{ return &handlerRunner{
httpGetter: httpGetter, httpGetter: httpGetter,
commandRunner: commandRunner, commandRunner: commandRunner,
containerManager: containerManager, containerManager: containerManager,
} }
} }
func (hr *HandlerRunner) Run(containerID kubecontainer.ContainerID, pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) { func (hr *handlerRunner) Run(containerID kubecontainer.ContainerID, pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) {
switch { switch {
case handler.Exec != nil: case handler.Exec != nil:
var msg string var msg string
@ -104,7 +105,7 @@ func resolvePort(portReference intstr.IntOrString, container *v1.Container) (int
return -1, fmt.Errorf("couldn't find port: %v in %v", portReference, container) return -1, fmt.Errorf("couldn't find port: %v in %v", portReference, container)
} }
func (hr *HandlerRunner) runHTTPHandler(pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) { func (hr *handlerRunner) runHTTPHandler(pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) {
host := handler.HTTPGet.Host host := handler.HTTPGet.Host
if len(host) == 0 { if len(host) == 0 {
status, err := hr.containerManager.GetPodStatus(pod.UID, pod.Name, pod.Namespace) status, err := hr.containerManager.GetPodStatus(pod.UID, pod.Name, pod.Namespace)
@ -129,10 +130,10 @@ func (hr *HandlerRunner) runHTTPHandler(pod *v1.Pod, container *v1.Container, ha
} }
url := fmt.Sprintf("http://%s/%s", net.JoinHostPort(host, strconv.Itoa(port)), handler.HTTPGet.Path) url := fmt.Sprintf("http://%s/%s", net.JoinHostPort(host, strconv.Itoa(port)), handler.HTTPGet.Path)
resp, err := hr.httpGetter.Get(url) resp, err := hr.httpGetter.Get(url)
return getHttpRespBody(resp), err return getHTTPRespBody(resp), err
} }
func getHttpRespBody(resp *http.Response) string { func getHTTPRespBody(resp *http.Response) string {
if resp == nil { if resp == nil {
return "" return ""
} }
@ -144,6 +145,8 @@ func getHttpRespBody(resp *http.Response) string {
return "" return ""
} }
// NewAppArmorAdmitHandler returns a PodAdmitHandler which is used to evaluate
// if a pod can be admitted from the perspective of AppArmor.
func NewAppArmorAdmitHandler(validator apparmor.Validator) PodAdmitHandler { func NewAppArmorAdmitHandler(validator apparmor.Validator) PodAdmitHandler {
return &appArmorAdmitHandler{ return &appArmorAdmitHandler{
Validator: validator, Validator: validator,
@ -171,6 +174,8 @@ func (a *appArmorAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult {
} }
} }
// NewNoNewPrivsAdmitHandler returns a PodAdmitHandler which is used to evaluate
// if a pod can be admitted from the perspective of NoNewPrivs.
func NewNoNewPrivsAdmitHandler(runtime kubecontainer.Runtime) PodAdmitHandler { func NewNoNewPrivsAdmitHandler(runtime kubecontainer.Runtime) PodAdmitHandler {
return &noNewPrivsAdmitHandler{ return &noNewPrivsAdmitHandler{
Runtime: runtime, Runtime: runtime,
@ -236,6 +241,8 @@ func noNewPrivsRequired(pod *v1.Pod) bool {
return false return false
} }
// NewProcMountAdmitHandler returns a PodAdmitHandler which is used to evaluate
// if a pod can be admitted from the perspective of ProcMount.
func NewProcMountAdmitHandler(runtime kubecontainer.Runtime) PodAdmitHandler { func NewProcMountAdmitHandler(runtime kubecontainer.Runtime) PodAdmitHandler {
return &procMountAdmitHandler{ return &procMountAdmitHandler{
Runtime: runtime, Runtime: runtime,

View File

@ -49,7 +49,9 @@ type predicateAdmitHandler struct {
var _ PodAdmitHandler = &predicateAdmitHandler{} var _ PodAdmitHandler = &predicateAdmitHandler{}
func NewPredicateAdmitHandler(getNodeAnyWayFunc getNodeAnyWayFuncType, admissionFailureHandler AdmissionFailureHandler, pluginResourceUpdateFunc pluginResourceUpdateFuncType) *predicateAdmitHandler { // NewPredicateAdmitHandler returns a PodAdmitHandler which is used to evaluates
// if a pod can be admitted from the perspective of predicates.
func NewPredicateAdmitHandler(getNodeAnyWayFunc getNodeAnyWayFuncType, admissionFailureHandler AdmissionFailureHandler, pluginResourceUpdateFunc pluginResourceUpdateFuncType) PodAdmitHandler {
return &predicateAdmitHandler{ return &predicateAdmitHandler{
getNodeAnyWayFunc, getNodeAnyWayFunc,
pluginResourceUpdateFunc, pluginResourceUpdateFunc,