Skip to content

Commit f810fca

Browse files
pdabelf5pdabelf5
authored
refactor: replace glog in k8s package 2 (#6576)
1 parent b643c2e commit f810fca

File tree

8 files changed

+109
-90
lines changed

8 files changed

+109
-90
lines changed

‎internal/k8s/controller.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func NewLoadBalancerController(input NewLoadBalancerControllerInput) *LoadBalanc
267267
lbc.recorder = eventBroadcaster.NewRecorder(scheme.Scheme,
268268
api_v1.EventSource{Component: "nginx-ingress-controller"})
269269

270-
lbc.syncQueue = newTaskQueue(lbc.sync)
270+
lbc.syncQueue = newTaskQueue(lbc.logger, lbc.sync)
271271
var err error
272272
if input.SpireAgentAddress != "" {
273273
lbc.spiffeCertFetcher, err = spiffe.NewX509CertFetcher(input.SpireAgentAddress, nil)
@@ -336,6 +336,7 @@ func NewLoadBalancerController(input NewLoadBalancerControllerInput) *LoadBalanc
336336
keyFunc: keyFunc,
337337
confClient: input.ConfClient,
338338
hasCorrectIngressClass: lbc.HasCorrectIngressClass,
339+
logger: lbc.logger,
339340
}
340341

341342
lbc.configuration = NewConfiguration(

‎internal/k8s/namespace.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"reflect"
66

7-
"github.com/golang/glog"
7+
nl "github.com/nginxinc/kubernetes-ingress/internal/logger"
88
api_v1 "k8s.io/api/core/v1"
99
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/client-go/informers"
@@ -16,29 +16,29 @@ func createNamespaceHandlers(lbc *LoadBalancerController) cache.ResourceEventHan
1616
return cache.ResourceEventHandlerFuncs{
1717
AddFunc: func(obj interface{}) {
1818
ns := obj.(*api_v1.Namespace)
19-
glog.V(3).Infof("Adding Namespace to list of watched Namespaces: %v", ns.Name)
19+
nl.Debugf(lbc.logger, "Adding Namespace to list of watched Namespaces: %v", ns.Name)
2020
lbc.AddSyncQueue(obj)
2121
},
2222
DeleteFunc: func(obj interface{}) {
2323
ns, isNs := obj.(*api_v1.Namespace)
2424
if !isNs {
2525
deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
2626
if !ok {
27-
glog.V(3).Infof("Error received unexpected object: %v", obj)
27+
nl.Debugf(lbc.logger, "Error received unexpected object: %v", obj)
2828
return
2929
}
3030
ns, ok = deletedState.Obj.(*api_v1.Namespace)
3131
if !ok {
32-
glog.V(3).Infof("Error DeletedFinalStateUnknown contained non-Namespace object: %v", deletedState.Obj)
32+
nl.Debugf(lbc.logger, "Error DeletedFinalStateUnknown contained non-Namespace object: %v", deletedState.Obj)
3333
return
3434
}
3535
}
36-
glog.V(3).Infof("Removing Namespace from list of watched Namespaces: %v", ns.Name)
36+
nl.Debugf(lbc.logger, "Removing Namespace from list of watched Namespaces: %v", ns.Name)
3737
lbc.AddSyncQueue(obj)
3838
},
3939
UpdateFunc: func(old, cur interface{}) {
4040
if !reflect.DeepEqual(old, cur) {
41-
glog.V(3).Infof("Namespace %v changed, syncing", cur.(*api_v1.Namespace).Name)
41+
nl.Debugf(lbc.logger, "Namespace %v changed, syncing", cur.(*api_v1.Namespace).Name)
4242
lbc.AddSyncQueue(cur)
4343
}
4444
},
@@ -72,7 +72,7 @@ func (lbc *LoadBalancerController) syncNamespace(task task) {
7272

7373
if ns != nil && ns.Status.Phase == api_v1.NamespaceActive {
7474
// namespace still exists
75-
glog.Infof("Removing Configuration for Unwatched Namespace: %v", key)
75+
nl.Infof(lbc.logger, "Removing Configuration for Unwatched Namespace: %v", key)
7676
// Watched label for namespace was removed
7777
// delete any now unwatched namespaced informer groups if required
7878
nsi := lbc.getNamespacedInformer(key)
@@ -81,7 +81,7 @@ func (lbc *LoadBalancerController) syncNamespace(task task) {
8181
delete(lbc.namespacedInformers, key)
8282
}
8383
} else {
84-
glog.Infof("Deleting Watchers for Deleted Namespace: %v", key)
84+
nl.Infof(lbc.logger, "Deleting Watchers for Deleted Namespace: %v", key)
8585
nsi := lbc.getNamespacedInformer(key)
8686
if nsi != nil {
8787
lbc.removeNamespacedInformer(nsi, key)
@@ -98,10 +98,10 @@ func (lbc *LoadBalancerController) syncNamespace(task task) {
9898
// if not create new namespaced informer group
9999
// update cert-manager informer group if required
100100
// update external-dns informer group if required
101-
glog.V(3).Infof("Adding or Updating Watched Namespace: %v", key)
101+
nl.Debugf(lbc.logger, "Adding or Updating Watched Namespace: %v", key)
102102
nsi := lbc.getNamespacedInformer(key)
103103
if nsi == nil {
104-
glog.Infof("Adding New Watched Namespace: %v", key)
104+
nl.Infof(lbc.logger, "Adding New Watched Namespace: %v", key)
105105
nsi = lbc.newNamespacedInformer(key)
106106
nsi.start()
107107
}

‎internal/k8s/policy.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"reflect"
66

7-
"github.com/golang/glog"
7+
nl "github.com/nginxinc/kubernetes-ingress/internal/logger"
88
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
99
"github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation"
1010
api_v1 "k8s.io/api/core/v1"
@@ -15,31 +15,31 @@ func createPolicyHandlers(lbc *LoadBalancerController) cache.ResourceEventHandle
1515
return cache.ResourceEventHandlerFuncs{
1616
AddFunc: func(obj interface{}) {
1717
pol := obj.(*conf_v1.Policy)
18-
glog.V(3).Infof("Adding Policy: %v", pol.Name)
18+
nl.Debugf(lbc.logger, "Adding Policy: %v", pol.Name)
1919
lbc.AddSyncQueue(pol)
2020
},
2121
DeleteFunc: func(obj interface{}) {
2222
pol, isPol := obj.(*conf_v1.Policy)
2323
if !isPol {
2424
deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
2525
if !ok {
26-
glog.V(3).Infof("Error received unexpected object: %v", obj)
26+
nl.Debugf(lbc.logger, "Error received unexpected object: %v", obj)
2727
return
2828
}
2929
pol, ok = deletedState.Obj.(*conf_v1.Policy)
3030
if !ok {
31-
glog.V(3).Infof("Error DeletedFinalStateUnknown contained non-Policy object: %v", deletedState.Obj)
31+
nl.Debugf(lbc.logger, "Error DeletedFinalStateUnknown contained non-Policy object: %v", deletedState.Obj)
3232
return
3333
}
3434
}
35-
glog.V(3).Infof("Removing Policy: %v", pol.Name)
35+
nl.Debugf(lbc.logger, "Removing Policy: %v", pol.Name)
3636
lbc.AddSyncQueue(pol)
3737
},
3838
UpdateFunc: func(old, cur interface{}) {
3939
curPol := cur.(*conf_v1.Policy)
4040
oldPol := old.(*conf_v1.Policy)
4141
if !reflect.DeepEqual(oldPol.Spec, curPol.Spec) {
42-
glog.V(3).Infof("Policy %v changed, syncing", curPol.Name)
42+
nl.Debugf(lbc.logger, "Policy %v changed, syncing", curPol.Name)
4343
lbc.AddSyncQueue(curPol)
4444
}
4545
},
@@ -67,7 +67,7 @@ func (lbc *LoadBalancerController) syncPolicy(task task) {
6767
return
6868
}
6969

70-
glog.V(2).Infof("Adding, Updating or Deleting Policy: %v\n", key)
70+
nl.Debugf(lbc.logger, "Adding, Updating or Deleting Policy: %v\n", key)
7171

7272
if polExists && lbc.HasCorrectIngressClass(obj) {
7373
pol := obj.(*conf_v1.Policy)
@@ -79,7 +79,7 @@ func (lbc *LoadBalancerController) syncPolicy(task task) {
7979
if lbc.reportCustomResourceStatusEnabled() {
8080
err = lbc.statusUpdater.UpdatePolicyStatus(pol, conf_v1.StateInvalid, "Rejected", msg)
8181
if err != nil {
82-
glog.V(3).Infof("Failed to update policy %s status: %v", key, err)
82+
nl.Debugf(lbc.logger, "Failed to update policy %s status: %v", key, err)
8383
}
8484
}
8585
} else {
@@ -89,7 +89,7 @@ func (lbc *LoadBalancerController) syncPolicy(task task) {
8989
if lbc.reportCustomResourceStatusEnabled() {
9090
err = lbc.statusUpdater.UpdatePolicyStatus(pol, conf_v1.StateValid, "AddedOrUpdated", msg)
9191
if err != nil {
92-
glog.V(3).Infof("Failed to update policy %s status: %v", key, err)
92+
nl.Debugf(lbc.logger, "Failed to update policy %s status: %v", key, err)
9393
}
9494
}
9595
}

‎internal/k8s/service.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"reflect"
55
"sort"
66

7-
"github.com/golang/glog"
7+
nl "github.com/nginxinc/kubernetes-ingress/internal/logger"
88
v1 "k8s.io/api/core/v1"
99
"k8s.io/client-go/tools/cache"
1010
)
@@ -23,25 +23,25 @@ func createServiceHandlers(lbc *LoadBalancerController) cache.ResourceEventHandl
2323
AddFunc: func(obj interface{}) {
2424
svc := obj.(*v1.Service)
2525

26-
glog.V(3).Infof("Adding service: %v", svc.Name)
26+
nl.Infof(lbc.logger, "Adding service: %v", svc.Name)
2727
lbc.AddSyncQueue(svc)
2828
},
2929
DeleteFunc: func(obj interface{}) {
3030
svc, isSvc := obj.(*v1.Service)
3131
if !isSvc {
3232
deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
3333
if !ok {
34-
glog.V(3).Infof("Error received unexpected object: %v", obj)
34+
nl.Infof(lbc.logger, "Error received unexpected object: %v", obj)
3535
return
3636
}
3737
svc, ok = deletedState.Obj.(*v1.Service)
3838
if !ok {
39-
glog.V(3).Infof("Error DeletedFinalStateUnknown contained non-Service object: %v", deletedState.Obj)
39+
nl.Infof(lbc.logger, "Error DeletedFinalStateUnknown contained non-Service object: %v", deletedState.Obj)
4040
return
4141
}
4242
}
4343

44-
glog.V(3).Infof("Removing service: %v", svc.Name)
44+
nl.Infof(lbc.logger, "Removing service: %v", svc.Name)
4545
lbc.AddSyncQueue(svc)
4646
},
4747
UpdateFunc: func(old, cur interface{}) {
@@ -53,7 +53,7 @@ func createServiceHandlers(lbc *LoadBalancerController) cache.ResourceEventHandl
5353
}
5454
oldSvc := old.(*v1.Service)
5555
if hasServiceChanges(oldSvc, curSvc) {
56-
glog.V(3).Infof("Service %v changed, syncing", curSvc.Name)
56+
nl.Infof(lbc.logger, "Service %v changed, syncing", curSvc.Name)
5757
lbc.AddSyncQueue(curSvc)
5858
}
5959
}
@@ -139,7 +139,7 @@ func (lbc *LoadBalancerController) syncService(task task) {
139139
// In that case we need to update the statuses of all resources
140140

141141
if lbc.IsExternalServiceKeyForStatus(key) {
142-
glog.V(3).Infof("Syncing service %v", key)
142+
nl.Infof(lbc.logger, "Syncing service %v", key)
143143

144144
if !exists {
145145
// service got removed
@@ -152,22 +152,22 @@ func (lbc *LoadBalancerController) syncService(task task) {
152152
if lbc.reportStatusEnabled() {
153153
ingresses := lbc.configuration.GetResourcesWithFilter(resourceFilter{Ingresses: true})
154154

155-
glog.V(3).Infof("Updating status for %v Ingresses", len(ingresses))
155+
nl.Infof(lbc.logger, "Updating status for %v Ingresses", len(ingresses))
156156

157157
err := lbc.statusUpdater.UpdateExternalEndpointsForResources(ingresses)
158158
if err != nil {
159-
glog.Errorf("error updating ingress status in syncService: %v", err)
159+
nl.Errorf(lbc.logger, "error updating ingress status in syncService: %v", err)
160160
}
161161
}
162162

163163
if lbc.areCustomResourcesEnabled && lbc.reportCustomResourceStatusEnabled() {
164164
virtualServers := lbc.configuration.GetResourcesWithFilter(resourceFilter{VirtualServers: true})
165165

166-
glog.V(3).Infof("Updating status for %v VirtualServers", len(virtualServers))
166+
nl.Infof(lbc.logger, "Updating status for %v VirtualServers", len(virtualServers))
167167

168168
err := lbc.statusUpdater.UpdateExternalEndpointsForResources(virtualServers)
169169
if err != nil {
170-
glog.V(3).Infof("error updating VirtualServer/VirtualServerRoute status in syncService: %v", err)
170+
nl.Infof(lbc.logger, "error updating VirtualServer/VirtualServerRoute status in syncService: %v", err)
171171
}
172172
}
173173

@@ -184,9 +184,9 @@ func (lbc *LoadBalancerController) syncService(task task) {
184184
if len(resources) == 0 {
185185
return
186186
}
187-
glog.V(3).Infof("Syncing service %v", key)
187+
nl.Infof(lbc.logger, "Syncing service %v", key)
188188

189-
glog.V(3).Infof("Updating %v resources", len(resources))
189+
nl.Infof(lbc.logger, "Updating %v resources", len(resources))
190190

191191
resourceExes := lbc.createExtendedResources(resources)
192192

0 commit comments

Comments
 (0)