Skip to content

Commit cef7876

Browse files
Yan YaoSergeyKanzhelev
andcommitted
Fix golint failures in pkg/kubelet/lifecycle
Co-authored-by: Sergey Kanzhelev <[email protected]>
1 parent e24a42f commit cef7876

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ pkg/kubelet/dockershim/network/hostport
106106
pkg/kubelet/dockershim/network/hostport/testing
107107
pkg/kubelet/dockershim/network/kubenet
108108
pkg/kubelet/dockershim/network/testing
109-
pkg/kubelet/lifecycle
110109
pkg/kubelet/pluginmanager/pluginwatcher
111110
pkg/kubelet/pod/testing
112111
pkg/kubelet/preemption

pkg/kubelet/lifecycle/admission_failure_handler_stub.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ type AdmissionFailureHandlerStub struct{}
2626

2727
var _ AdmissionFailureHandler = &AdmissionFailureHandlerStub{}
2828

29+
// NewAdmissionFailureHandlerStub returns an instance of AdmissionFailureHandlerStub.
2930
func NewAdmissionFailureHandlerStub() *AdmissionFailureHandlerStub {
3031
return &AdmissionFailureHandlerStub{}
3132
}
3233

34+
// HandleAdmissionFailure simply passes admission rejection on, with no special handling.
3335
func (n *AdmissionFailureHandlerStub) HandleAdmissionFailure(admitPod *v1.Pod, failureReasons []PredicateFailureReason) ([]PredicateFailureReason, error) {
3436
return failureReasons, nil
3537
}

pkg/kubelet/lifecycle/doc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Handlers for pod lifecycle events and interfaces to integrate
18-
// with kubelet admission, synchronization, and eviction of pods.
17+
// Package lifecycle contains handlers for pod lifecycle events and interfaces
18+
// to integrate with kubelet admission, synchronization, and eviction of pods.
1919
package lifecycle // import "k8s.io/kubernetes/pkg/kubelet/lifecycle"

pkg/kubelet/lifecycle/handlers.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const (
3737
maxRespBodyLength = 10 * 1 << 10 // 10KB
3838
)
3939

40-
type HandlerRunner struct {
40+
type handlerRunner struct {
4141
httpGetter kubetypes.HTTPGetter
4242
commandRunner kubecontainer.CommandRunner
4343
containerManager podStatusProvider
@@ -47,15 +47,16 @@ type podStatusProvider interface {
4747
GetPodStatus(uid types.UID, name, namespace string) (*kubecontainer.PodStatus, error)
4848
}
4949

50+
// NewHandlerRunner returns a configured lifecycle handler for a container.
5051
func NewHandlerRunner(httpGetter kubetypes.HTTPGetter, commandRunner kubecontainer.CommandRunner, containerManager podStatusProvider) kubecontainer.HandlerRunner {
51-
return &HandlerRunner{
52+
return &handlerRunner{
5253
httpGetter: httpGetter,
5354
commandRunner: commandRunner,
5455
containerManager: containerManager,
5556
}
5657
}
5758

58-
func (hr *HandlerRunner) Run(containerID kubecontainer.ContainerID, pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) {
59+
func (hr *handlerRunner) Run(containerID kubecontainer.ContainerID, pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) {
5960
switch {
6061
case handler.Exec != nil:
6162
var msg string
@@ -104,7 +105,7 @@ func resolvePort(portReference intstr.IntOrString, container *v1.Container) (int
104105
return -1, fmt.Errorf("couldn't find port: %v in %v", portReference, container)
105106
}
106107

107-
func (hr *HandlerRunner) runHTTPHandler(pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) {
108+
func (hr *handlerRunner) runHTTPHandler(pod *v1.Pod, container *v1.Container, handler *v1.Handler) (string, error) {
108109
host := handler.HTTPGet.Host
109110
if len(host) == 0 {
110111
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
129130
}
130131
url := fmt.Sprintf("http://%s/%s", net.JoinHostPort(host, strconv.Itoa(port)), handler.HTTPGet.Path)
131132
resp, err := hr.httpGetter.Get(url)
132-
return getHttpRespBody(resp), err
133+
return getHTTPRespBody(resp), err
133134
}
134135

135-
func getHttpRespBody(resp *http.Response) string {
136+
func getHTTPRespBody(resp *http.Response) string {
136137
if resp == nil {
137138
return ""
138139
}
@@ -144,6 +145,8 @@ func getHttpRespBody(resp *http.Response) string {
144145
return ""
145146
}
146147

148+
// NewAppArmorAdmitHandler returns a PodAdmitHandler which is used to evaluate
149+
// if a pod can be admitted from the perspective of AppArmor.
147150
func NewAppArmorAdmitHandler(validator apparmor.Validator) PodAdmitHandler {
148151
return &appArmorAdmitHandler{
149152
Validator: validator,
@@ -171,6 +174,8 @@ func (a *appArmorAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult {
171174
}
172175
}
173176

177+
// NewNoNewPrivsAdmitHandler returns a PodAdmitHandler which is used to evaluate
178+
// if a pod can be admitted from the perspective of NoNewPrivs.
174179
func NewNoNewPrivsAdmitHandler(runtime kubecontainer.Runtime) PodAdmitHandler {
175180
return &noNewPrivsAdmitHandler{
176181
Runtime: runtime,
@@ -236,6 +241,8 @@ func noNewPrivsRequired(pod *v1.Pod) bool {
236241
return false
237242
}
238243

244+
// NewProcMountAdmitHandler returns a PodAdmitHandler which is used to evaluate
245+
// if a pod can be admitted from the perspective of ProcMount.
239246
func NewProcMountAdmitHandler(runtime kubecontainer.Runtime) PodAdmitHandler {
240247
return &procMountAdmitHandler{
241248
Runtime: runtime,

pkg/kubelet/lifecycle/predicate.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ type predicateAdmitHandler struct {
4949

5050
var _ PodAdmitHandler = &predicateAdmitHandler{}
5151

52-
func NewPredicateAdmitHandler(getNodeAnyWayFunc getNodeAnyWayFuncType, admissionFailureHandler AdmissionFailureHandler, pluginResourceUpdateFunc pluginResourceUpdateFuncType) *predicateAdmitHandler {
52+
// NewPredicateAdmitHandler returns a PodAdmitHandler which is used to evaluates
53+
// if a pod can be admitted from the perspective of predicates.
54+
func NewPredicateAdmitHandler(getNodeAnyWayFunc getNodeAnyWayFuncType, admissionFailureHandler AdmissionFailureHandler, pluginResourceUpdateFunc pluginResourceUpdateFuncType) PodAdmitHandler {
5355
return &predicateAdmitHandler{
5456
getNodeAnyWayFunc,
5557
pluginResourceUpdateFunc,

0 commit comments

Comments
 (0)