scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix golint warnings in daemon controller

Browse Source 
The only on remaining asks to rename DaemonSetsController, which is a
public interface and would need proper deprecation first.
This commit is contained in:
dmathieu
2018-02-05 10:11:09 +01:00
committed by dmathieu
parent 68da45623f
commit dadce343be
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@@ -100,7 +100,6 @@ pkg/controller/cloud
pkg/controller/clusterroleaggregation pkg/controller/clusterroleaggregation
pkg/controller/cronjob pkg/controller/cronjob
pkg/controller/daemon pkg/controller/daemon
pkg/controller/daemon/util
pkg/controller/deployment pkg/controller/deployment
pkg/controller/deployment/util pkg/controller/deployment/util
pkg/controller/disruption pkg/controller/disruption

11
pkg/controller/daemon/daemon_controller.go
View File

@@ -63,13 +63,16 @@ import (
) )
const ( const (
// The value of 250 is chosen b/c values that are too high can cause registry DoS issues // BurstReplicas is a rate limiter for booting pods on a lot of pods.
// The value of 250 is chosen b/c values that are too high can cause registry DoS issues.
BurstReplicas = 250 BurstReplicas = 250
// If sending a status update to API server fails, we retry a finite number of times. // StatusUpdateRetries limits the number of retries if sending a status update to API server fails.
StatusUpdateRetries = 1 StatusUpdateRetries = 1
)
// Reasons for DaemonSet events // Reasons for DaemonSet events
const (
// SelectingAllReason is added to an event when a DaemonSet selects all Pods. // SelectingAllReason is added to an event when a DaemonSet selects all Pods.
SelectingAllReason = "SelectingAll" SelectingAllReason = "SelectingAll"
// FailedPlacementReason is added to an event when a DaemonSet can't schedule a Pod to a specified node. // FailedPlacementReason is added to an event when a DaemonSet can't schedule a Pod to a specified node.
@@ -130,6 +133,7 @@ type DaemonSetsController struct {
suspendedDaemonPods map[string]sets.String suspendedDaemonPods map[string]sets.String
} }
// NewDaemonSetsController creates a new DaemonSetsController
func NewDaemonSetsController(daemonSetInformer extensionsinformers.DaemonSetInformer, historyInformer appsinformers.ControllerRevisionInformer, podInformer coreinformers.PodInformer, nodeInformer coreinformers.NodeInformer, kubeClient clientset.Interface) (*DaemonSetsController, error) { func NewDaemonSetsController(daemonSetInformer extensionsinformers.DaemonSetInformer, historyInformer appsinformers.ControllerRevisionInformer, podInformer coreinformers.PodInformer, nodeInformer coreinformers.NodeInformer, kubeClient clientset.Interface) (*DaemonSetsController, error) {
eventBroadcaster := record.NewBroadcaster() eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
@@ -1320,6 +1324,7 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *v1.Node, ds *exten
return return
} }
// NewPod creates a new pod
func NewPod(ds *extensions.DaemonSet, nodeName string) *v1.Pod { func NewPod(ds *extensions.DaemonSet, nodeName string) *v1.Pod {
newPod := &v1.Pod{Spec: ds.Spec.Template.Spec, ObjectMeta: ds.Spec.Template.ObjectMeta} newPod := &v1.Pod{Spec: ds.Spec.Template.Spec, ObjectMeta: ds.Spec.Template.ObjectMeta}
newPod.Namespace = ds.Namespace newPod.Namespace = ds.Namespace

8
pkg/controller/daemon/daemon_controller_test.go
View File

@@ -84,12 +84,12 @@ var (
) )
func getKey(ds *extensions.DaemonSet, t *testing.T) string { func getKey(ds *extensions.DaemonSet, t *testing.T) string {
if key, err := controller.KeyFunc(ds); err != nil { key, err := controller.KeyFunc(ds)
if err != nil {
t.Errorf("Unexpected error getting key for ds %v: %v", ds.Name, err) t.Errorf("Unexpected error getting key for ds %v: %v", ds.Name, err)
return ""
} else {
return key
} }
return key
} }
func newDaemonSet(name string) *extensions.DaemonSet { func newDaemonSet(name string) *extensions.DaemonSet {

2
pkg/controller/daemon/util/daemonset_util.go
View File

@@ -94,7 +94,7 @@ func CreatePodTemplate(template v1.PodTemplateSpec, generation int64, hash strin
return newTemplate return newTemplate
} }
// IsPodUpdate checks if pod contains label value that either matches templateGeneration or hash // IsPodUpdated checks if pod contains label value that either matches templateGeneration or hash
func IsPodUpdated(dsTemplateGeneration int64, pod *v1.Pod, hash string) bool { func IsPodUpdated(dsTemplateGeneration int64, pod *v1.Pod, hash string) bool {
// Compare with hash to see if the pod is updated, need to maintain backward compatibility of templateGeneration // Compare with hash to see if the pod is updated, need to maintain backward compatibility of templateGeneration
templateMatches := pod.Labels[extensions.DaemonSetTemplateGenerationKey] == fmt.Sprint(dsTemplateGeneration) templateMatches := pod.Labels[extensions.DaemonSetTemplateGenerationKey] == fmt.Sprint(dsTemplateGeneration)