Skip to content

Commit f2e5ef6

Browse files
authored
Merge pull request kubernetes#88062 from s-ito-ts/golint_garbagecollector
Fix golint errors in pkg/controller/garbagecollector
2 parents 5aa2e3c + e6b9a7a commit f2e5ef6

File tree

6 files changed

+32
-23
lines changed

6 files changed

+32
-23
lines changed

pkg/controller/garbagecollector/dump.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ namespace=%v
122122
}
123123
}
124124

125+
// NewGonumVertex creates a new gonumVertex.
125126
func NewGonumVertex(node *node, nodeID int64) *gonumVertex {
126127
gv, err := schema.ParseGroupVersion(node.identity.APIVersion)
127128
if err != nil {
@@ -140,6 +141,7 @@ func NewGonumVertex(node *node, nodeID int64) *gonumVertex {
140141
}
141142
}
142143

144+
// NewMissingGonumVertex creates a new gonumVertex.
143145
func NewMissingGonumVertex(ownerRef metav1.OwnerReference, nodeID int64) *gonumVertex {
144146
gv, err := schema.ParseGroupVersion(ownerRef.APIVersion)
145147
if err != nil {
@@ -242,6 +244,7 @@ func toGonumGraphForObj(uidToNode map[types.UID]*node, uids ...types.UID) graph.
242244
return toGonumGraph(interestingNodes)
243245
}
244246

247+
// NewDebugHandler creates a new debugHTTPHandler.
245248
func NewDebugHandler(controller *GarbageCollector) http.Handler {
246249
return &debugHTTPHandler{controller: controller}
247250
}

pkg/controller/garbagecollector/garbagecollector.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343
_ "k8s.io/client-go/kubernetes"
4444
)
4545

46+
// ResourceResyncTime defines the resync period of the garbage collector's informers.
4647
const ResourceResyncTime time.Duration = 0
4748

4849
// GarbageCollector runs reflectors to watch for changes of managed API
@@ -70,6 +71,7 @@ type GarbageCollector struct {
7071
workerLock sync.RWMutex
7172
}
7273

74+
// NewGarbageCollector creates a new GarbageCollector.
7375
func NewGarbageCollector(
7476
metadataClient metadata.Interface,
7577
mapper resettableRESTMapper,
@@ -120,6 +122,7 @@ func (gc *GarbageCollector) resyncMonitors(deletableResources map[schema.GroupVe
120122
return nil
121123
}
122124

125+
// Run starts garbage collector workers.
123126
func (gc *GarbageCollector) Run(workers int, stopCh <-chan struct{}) {
124127
defer utilruntime.HandleCrash()
125128
defer gc.attemptToDelete.ShutDown()
@@ -272,6 +275,7 @@ func waitForStopOrTimeout(stopCh <-chan struct{}, timeout time.Duration) <-chan
272275
return stopChWithTimeout
273276
}
274277

278+
// IsSynced returns true if dependencyGraphBuilder is synced.
275279
func (gc *GarbageCollector) IsSynced() bool {
276280
return gc.dependencyGraphBuilder.IsSynced()
277281
}

pkg/controller/garbagecollector/garbagecollector_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ type testRESTMapper struct {
5555
meta.RESTMapper
5656
}
5757

58-
func (_ *testRESTMapper) Reset() {}
58+
func (*testRESTMapper) Reset() {}
5959

6060
func TestGarbageCollectorConstruction(t *testing.T) {
6161
config := &restclient.Config{}
@@ -928,16 +928,16 @@ type fakeServerResources struct {
928928
InterfaceUsedCount int
929929
}
930930

931-
func (_ *fakeServerResources) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
931+
func (*fakeServerResources) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
932932
return nil, nil
933933
}
934934

935935
// Deprecated: use ServerGroupsAndResources instead.
936-
func (_ *fakeServerResources) ServerResources() ([]*metav1.APIResourceList, error) {
936+
func (*fakeServerResources) ServerResources() ([]*metav1.APIResourceList, error) {
937937
return nil, nil
938938
}
939939

940-
func (_ *fakeServerResources) ServerGroupsAndResources() ([]*metav1.APIGroup, []*metav1.APIResourceList, error) {
940+
func (*fakeServerResources) ServerGroupsAndResources() ([]*metav1.APIGroup, []*metav1.APIResourceList, error) {
941941
return nil, nil, nil
942942
}
943943

@@ -966,6 +966,6 @@ func (f *fakeServerResources) getInterfaceUsedCount() int {
966966
return f.InterfaceUsedCount
967967
}
968968

969-
func (_ *fakeServerResources) ServerPreferredNamespacedResources() ([]*metav1.APIResourceList, error) {
969+
func (*fakeServerResources) ServerPreferredNamespacedResources() ([]*metav1.APIResourceList, error) {
970970
return nil, nil
971971
}

pkg/controller/garbagecollector/graph.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,32 +98,32 @@ func (n *node) isDeletingDependents() bool {
9898
return n.deletingDependents
9999
}
100100

101-
func (ownerNode *node) addDependent(dependent *node) {
102-
ownerNode.dependentsLock.Lock()
103-
defer ownerNode.dependentsLock.Unlock()
104-
ownerNode.dependents[dependent] = struct{}{}
101+
func (n *node) addDependent(dependent *node) {
102+
n.dependentsLock.Lock()
103+
defer n.dependentsLock.Unlock()
104+
n.dependents[dependent] = struct{}{}
105105
}
106106

107-
func (ownerNode *node) deleteDependent(dependent *node) {
108-
ownerNode.dependentsLock.Lock()
109-
defer ownerNode.dependentsLock.Unlock()
110-
delete(ownerNode.dependents, dependent)
107+
func (n *node) deleteDependent(dependent *node) {
108+
n.dependentsLock.Lock()
109+
defer n.dependentsLock.Unlock()
110+
delete(n.dependents, dependent)
111111
}
112112

113-
func (ownerNode *node) dependentsLength() int {
114-
ownerNode.dependentsLock.RLock()
115-
defer ownerNode.dependentsLock.RUnlock()
116-
return len(ownerNode.dependents)
113+
func (n *node) dependentsLength() int {
114+
n.dependentsLock.RLock()
115+
defer n.dependentsLock.RUnlock()
116+
return len(n.dependents)
117117
}
118118

119119
// Note that this function does not provide any synchronization guarantees;
120120
// items could be added to or removed from ownerNode.dependents the moment this
121121
// function returns.
122-
func (ownerNode *node) getDependents() []*node {
123-
ownerNode.dependentsLock.RLock()
124-
defer ownerNode.dependentsLock.RUnlock()
122+
func (n *node) getDependents() []*node {
123+
n.dependentsLock.RLock()
124+
defer n.dependentsLock.RUnlock()
125125
var ret []*node
126-
for dep := range ownerNode.dependents {
126+
for dep := range n.dependents {
127127
ret = append(ret, dep)
128128
}
129129
return ret

pkg/controller/garbagecollector/graph_builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ type event struct {
6767
gvk schema.GroupVersionKind
6868
}
6969

70-
// GraphBuilder: based on the events supplied by the informers, GraphBuilder updates
71-
// uidToNode, a graph that caches the dependencies as we know, and enqueues
70+
// GraphBuilder processes events supplied by the informers, updates uidToNode,
71+
// a graph that caches the dependencies as we know, and enqueues
7272
// items to the attemptToDelete and attemptToOrphan.
7373
type GraphBuilder struct {
7474
restMapper meta.RESTMapper

pkg/controller/garbagecollector/patch.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ type objectForFinalizersPatch struct {
9292
ObjectMetaForFinalizersPatch `json:"metadata"`
9393
}
9494

95+
// ObjectMetaForFinalizersPatch defines object meta struct for finalizers patch operation.
9596
type ObjectMetaForFinalizersPatch struct {
9697
ResourceVersion string `json:"resourceVersion"`
9798
Finalizers []string `json:"finalizers"`
@@ -101,6 +102,7 @@ type objectForPatch struct {
101102
ObjectMetaForPatch `json:"metadata"`
102103
}
103104

105+
// ObjectMetaForPatch defines object meta struct for patch operation.
104106
type ObjectMetaForPatch struct {
105107
ResourceVersion string `json:"resourceVersion"`
106108
OwnerReferences []metav1.OwnerReference `json:"ownerReferences"`

0 commit comments

Comments
 (0)