github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78015 from SataQiu/fix-golint-kubelet-20190517

Browse Source 
Fix golint failures of pkg/kubelet/configmap pkg/kubelet/custommetrics
This commit is contained in:
Kubernetes Prow Robot 2019-06-15 00:46:09 -07:00 committed by GitHub
commit 480457994d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.golint_failures
View File

@ -153,10 +153,8 @@ pkg/kubelet/checkpointmanager/testing/example_checkpoint_formats/v1
pkg/kubelet/client pkg/kubelet/client
pkg/kubelet/cm pkg/kubelet/cm
pkg/kubelet/config pkg/kubelet/config
pkg/kubelet/configmap
pkg/kubelet/container pkg/kubelet/container
pkg/kubelet/container/testing pkg/kubelet/container/testing
pkg/kubelet/custommetrics
pkg/kubelet/dockershim pkg/kubelet/dockershim
pkg/kubelet/dockershim/libdocker pkg/kubelet/dockershim/libdocker
pkg/kubelet/dockershim/network pkg/kubelet/dockershim/network

2
pkg/kubelet/configmap/configmap_manager.go
View File

@ -33,6 +33,7 @@ import (
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
) )
// Manager interface provides methods for Kubelet to manage ConfigMap.
type Manager interface { type Manager interface {
// Get configmap by configmap namespace and name. // Get configmap by configmap namespace and name.
GetConfigMap(namespace, name string) (*v1.ConfigMap, error) GetConfigMap(namespace, name string) (*v1.ConfigMap, error)
@ -54,6 +55,7 @@ type simpleConfigMapManager struct {
kubeClient clientset.Interface kubeClient clientset.Interface
} }
// NewSimpleConfigMapManager creates a new ConfigMapManager instance.
func NewSimpleConfigMapManager(kubeClient clientset.Interface) Manager { func NewSimpleConfigMapManager(kubeClient clientset.Interface) Manager {
return &simpleConfigMapManager{kubeClient: kubeClient} return &simpleConfigMapManager{kubeClient: kubeClient}
} }

1
pkg/kubelet/configmap/fake_manager.go
View File

@ -25,6 +25,7 @@ import (
type fakeManager struct { type fakeManager struct {
} }
// NewFakeManager creates empty/fake ConfigMap manager
func NewFakeManager() Manager { func NewFakeManager() Manager {
return &fakeManager{} return &fakeManager{}
} }

4
pkg/kubelet/custommetrics/custom_metrics.go
View File

@ -24,13 +24,15 @@ import (
) )
const ( const (
// CustomMetricsDefinitionContainerFile is the file in container that stores Custom Metrics definition
CustomMetricsDefinitionContainerFile = "definition.json" CustomMetricsDefinitionContainerFile = "definition.json"
// CustomMetricsDefinitionDir is the dir where Custom Metrics definition is stored
CustomMetricsDefinitionDir = "/etc/custom-metrics" CustomMetricsDefinitionDir = "/etc/custom-metrics"
) )
// GetCAdvisorCustomMetricsDefinitionPath returns a path to a cAdvisor-specific custom metrics configuration.
// Alpha implementation. // Alpha implementation.
// Returns a path to a cAdvisor-specific custom metrics configuration.
func GetCAdvisorCustomMetricsDefinitionPath(container *v1.Container) (*string, error) { func GetCAdvisorCustomMetricsDefinitionPath(container *v1.Container) (*string, error) {
// Assumes that the container has Custom Metrics enabled if it has "/etc/custom-metrics" directory // Assumes that the container has Custom Metrics enabled if it has "/etc/custom-metrics" directory
// mounted as a volume. Custom Metrics definition is expected to be in "definition.json". // mounted as a volume. Custom Metrics definition is expected to be in "definition.json".