Skip to content

Commit 3f79c6d

Browse files
pdabelf5pdabelf5
authored
refactor: replace glog in k8s package 1 (#6575)
1 parent 677c054 commit 3f79c6d

File tree

8 files changed

+140
-134
lines changed

8 files changed

+140
-134
lines changed

‎internal/k8s/appprotect_dos.go

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

7-
"github.com/golang/glog"
87
"github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectdos"
8+
nl "github.com/nginxinc/kubernetes-ingress/internal/logger"
99
"github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1"
1010
api_v1 "k8s.io/api/core/v1"
1111
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -16,19 +16,19 @@ func createAppProtectDosPolicyHandlers(lbc *LoadBalancerController) cache.Resour
1616
handlers := cache.ResourceEventHandlerFuncs{
1717
AddFunc: func(obj interface{}) {
1818
pol := obj.(*unstructured.Unstructured)
19-
glog.V(3).Infof("Adding AppProtectDosPolicy: %v", pol.GetName())
19+
nl.Debugf(lbc.logger, "Adding AppProtectDosPolicy: %v", pol.GetName())
2020
lbc.AddSyncQueue(pol)
2121
},
2222
UpdateFunc: func(oldObj, obj interface{}) {
2323
oldPol := oldObj.(*unstructured.Unstructured)
2424
newPol := obj.(*unstructured.Unstructured)
25-
different, err := areResourcesDifferent(oldPol, newPol)
25+
different, err := areResourcesDifferent(lbc.logger, oldPol, newPol)
2626
if err != nil {
27-
glog.V(3).Infof("Error when comparing policy %v", err)
27+
nl.Debugf(lbc.logger, "Error when comparing policy %v", err)
2828
lbc.AddSyncQueue(newPol)
2929
}
3030
if different {
31-
glog.V(3).Infof("ApDosPolicy %v changed, syncing", oldPol.GetName())
31+
nl.Debugf(lbc.logger, "ApDosPolicy %v changed, syncing", oldPol.GetName())
3232
lbc.AddSyncQueue(newPol)
3333
}
3434
},
@@ -43,19 +43,19 @@ func createAppProtectDosLogConfHandlers(lbc *LoadBalancerController) cache.Resou
4343
handlers := cache.ResourceEventHandlerFuncs{
4444
AddFunc: func(obj interface{}) {
4545
conf := obj.(*unstructured.Unstructured)
46-
glog.V(3).Infof("Adding AppProtectDosLogConf: %v", conf.GetName())
46+
nl.Debugf(lbc.logger, "Adding AppProtectDosLogConf: %v", conf.GetName())
4747
lbc.AddSyncQueue(conf)
4848
},
4949
UpdateFunc: func(oldObj, obj interface{}) {
5050
oldConf := oldObj.(*unstructured.Unstructured)
5151
newConf := obj.(*unstructured.Unstructured)
52-
different, err := areResourcesDifferent(oldConf, newConf)
52+
different, err := areResourcesDifferent(lbc.logger, oldConf, newConf)
5353
if err != nil {
54-
glog.V(3).Infof("Error when comparing DosLogConfs %v", err)
54+
nl.Debugf(lbc.logger, "Error when comparing DosLogConfs %v", err)
5555
lbc.AddSyncQueue(newConf)
5656
}
5757
if different {
58-
glog.V(3).Infof("ApDosLogConf %v changed, syncing", oldConf.GetName())
58+
nl.Debugf(lbc.logger, "ApDosLogConf %v changed, syncing", oldConf.GetName())
5959
lbc.AddSyncQueue(newConf)
6060
}
6161
},
@@ -70,15 +70,15 @@ func createAppProtectDosProtectedResourceHandlers(lbc *LoadBalancerController) c
7070
handlers := cache.ResourceEventHandlerFuncs{
7171
AddFunc: func(obj interface{}) {
7272
conf := obj.(*v1beta1.DosProtectedResource)
73-
glog.V(3).Infof("Adding DosProtectedResource: %v", conf.GetName())
73+
nl.Debugf(lbc.logger, "Adding DosProtectedResource: %v", conf.GetName())
7474
lbc.AddSyncQueue(conf)
7575
},
7676
UpdateFunc: func(oldObj, obj interface{}) {
7777
oldConf := oldObj.(*v1beta1.DosProtectedResource)
7878
newConf := obj.(*v1beta1.DosProtectedResource)
7979

8080
if !reflect.DeepEqual(oldConf.Spec, newConf.Spec) {
81-
glog.V(3).Infof("DosProtectedResource %v changed, syncing", oldConf.GetName())
81+
nl.Debugf(lbc.logger, "DosProtectedResource %v changed, syncing", oldConf.GetName())
8282
lbc.AddSyncQueue(newConf)
8383
}
8484
},
@@ -118,7 +118,7 @@ func (nsi *namespacedInformer) addAppProtectDosProtectedResourceHandler(handlers
118118

119119
func (lbc *LoadBalancerController) syncAppProtectDosPolicy(task task) {
120120
key := task.Key
121-
glog.V(3).Infof("Syncing AppProtectDosPolicy %v", key)
121+
nl.Debugf(lbc.logger, "Syncing AppProtectDosPolicy %v", key)
122122
var obj interface{}
123123
var polExists bool
124124
var err error
@@ -134,10 +134,10 @@ func (lbc *LoadBalancerController) syncAppProtectDosPolicy(task task) {
134134
var problems []appprotectdos.Problem
135135

136136
if !polExists {
137-
glog.V(2).Infof("Deleting APDosPolicy: %v\n", key)
137+
nl.Debugf(lbc.logger, "Deleting APDosPolicy: %v\n", key)
138138
changes, problems = lbc.dosConfiguration.DeletePolicy(key)
139139
} else {
140-
glog.V(2).Infof("Adding or Updating APDosPolicy: %v\n", key)
140+
nl.Debugf(lbc.logger, "Adding or Updating APDosPolicy: %v\n", key)
141141
changes, problems = lbc.dosConfiguration.AddOrUpdatePolicy(obj.(*unstructured.Unstructured))
142142
}
143143

@@ -147,7 +147,7 @@ func (lbc *LoadBalancerController) syncAppProtectDosPolicy(task task) {
147147

148148
func (lbc *LoadBalancerController) syncAppProtectDosLogConf(task task) {
149149
key := task.Key
150-
glog.V(3).Infof("Syncing APDosLogConf %v", key)
150+
nl.Debugf(lbc.logger, "Syncing APDosLogConf %v", key)
151151
var obj interface{}
152152
var confExists bool
153153
var err error
@@ -163,10 +163,10 @@ func (lbc *LoadBalancerController) syncAppProtectDosLogConf(task task) {
163163
var problems []appprotectdos.Problem
164164

165165
if !confExists {
166-
glog.V(2).Infof("Deleting APDosLogConf: %v\n", key)
166+
nl.Debugf(lbc.logger, "Deleting APDosLogConf: %v\n", key)
167167
changes, problems = lbc.dosConfiguration.DeleteLogConf(key)
168168
} else {
169-
glog.V(2).Infof("Adding or Updating APDosLogConf: %v\n", key)
169+
nl.Debugf(lbc.logger, "Adding or Updating APDosLogConf: %v\n", key)
170170
changes, problems = lbc.dosConfiguration.AddOrUpdateLogConf(obj.(*unstructured.Unstructured))
171171
}
172172

@@ -176,7 +176,7 @@ func (lbc *LoadBalancerController) syncAppProtectDosLogConf(task task) {
176176

177177
func (lbc *LoadBalancerController) syncDosProtectedResource(task task) {
178178
key := task.Key
179-
glog.V(3).Infof("Syncing DosProtectedResource %v", key)
179+
nl.Debugf(lbc.logger, "Syncing DosProtectedResource %v", key)
180180
var obj interface{}
181181
var confExists bool
182182
var err error
@@ -192,10 +192,10 @@ func (lbc *LoadBalancerController) syncDosProtectedResource(task task) {
192192
var problems []appprotectdos.Problem
193193

194194
if confExists {
195-
glog.V(2).Infof("Adding or Updating DosProtectedResource: %v\n", key)
195+
nl.Debugf(lbc.logger, "Adding or Updating DosProtectedResource: %v\n", key)
196196
changes, problems = lbc.dosConfiguration.AddOrUpdateDosProtectedResource(obj.(*v1beta1.DosProtectedResource))
197197
} else {
198-
glog.V(2).Infof("Deleting DosProtectedResource: %v\n", key)
198+
nl.Debugf(lbc.logger, "Deleting DosProtectedResource: %v\n", key)
199199
changes, problems = lbc.dosConfiguration.DeleteProtectedResource(key)
200200
}
201201

@@ -204,13 +204,13 @@ func (lbc *LoadBalancerController) syncDosProtectedResource(task task) {
204204
}
205205

206206
func (lbc *LoadBalancerController) processAppProtectDosChanges(changes []appprotectdos.Change) {
207-
glog.V(3).Infof("Processing %v App Protect Dos changes", len(changes))
207+
nl.Debugf(lbc.logger, "Processing %v App Protect Dos changes", len(changes))
208208

209209
for _, c := range changes {
210210
if c.Op == appprotectdos.AddOrUpdate {
211211
switch impl := c.Resource.(type) {
212212
case *appprotectdos.DosProtectedResourceEx:
213-
glog.V(3).Infof("handling change UPDATE OR ADD for DOS protected %s/%s", impl.Obj.Namespace, impl.Obj.Name)
213+
nl.Debugf(lbc.logger, "handling change UPDATE OR ADD for DOS protected %s/%s", impl.Obj.Namespace, impl.Obj.Name)
214214
resources := lbc.configuration.FindResourcesForAppProtectDosProtected(impl.Obj.Namespace, impl.Obj.Name)
215215
resourceExes := lbc.createExtendedResources(resources)
216216
warnings, err := lbc.configurator.AddOrUpdateResourcesThatUseDosProtected(resourceExes.IngressExes, resourceExes.MergeableIngresses, resourceExes.VirtualServerExes)
@@ -240,7 +240,7 @@ func (lbc *LoadBalancerController) processAppProtectDosChanges(changes []appprot
240240
lbc.configurator.DeleteAppProtectDosLogConf(impl.Obj)
241241

242242
case *appprotectdos.DosProtectedResourceEx:
243-
glog.V(3).Infof("handling change DELETE for DOS protected %s/%s", impl.Obj.Namespace, impl.Obj.Name)
243+
nl.Debugf(lbc.logger, "handling change DELETE for DOS protected %s/%s", impl.Obj.Namespace, impl.Obj.Name)
244244
resources := lbc.configuration.FindResourcesForAppProtectDosProtected(impl.Obj.Namespace, impl.Obj.Name)
245245
resourceExes := lbc.createExtendedResources(resources)
246246
warnings, err := lbc.configurator.AddOrUpdateResourcesThatUseDosProtected(resourceExes.IngressExes, resourceExes.MergeableIngresses, resourceExes.VirtualServerExes)
@@ -251,7 +251,7 @@ func (lbc *LoadBalancerController) processAppProtectDosChanges(changes []appprot
251251
}
252252

253253
func (lbc *LoadBalancerController) processAppProtectDosProblems(problems []appprotectdos.Problem) {
254-
glog.V(3).Infof("Processing %v App Protect Dos problems", len(problems))
254+
nl.Debugf(lbc.logger, "Processing %v App Protect Dos problems", len(problems))
255255

256256
for _, p := range problems {
257257
eventType := api_v1.EventTypeWarning

‎internal/k8s/appprotect_waf.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/golang/glog"
87
"github.com/nginxinc/kubernetes-ingress/internal/configs"
98
"github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect"
109
"github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon"
10+
nl "github.com/nginxinc/kubernetes-ingress/internal/logger"
1111
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
1212
api_v1 "k8s.io/api/core/v1"
1313
networking "k8s.io/api/networking/v1"
@@ -19,19 +19,19 @@ func createAppProtectPolicyHandlers(lbc *LoadBalancerController) cache.ResourceE
1919
handlers := cache.ResourceEventHandlerFuncs{
2020
AddFunc: func(obj interface{}) {
2121
pol := obj.(*unstructured.Unstructured)
22-
glog.V(3).Infof("Adding AppProtectPolicy: %v", pol.GetName())
22+
nl.Debugf(lbc.logger, "Adding AppProtectPolicy: %v", pol.GetName())
2323
lbc.AddSyncQueue(pol)
2424
},
2525
UpdateFunc: func(oldObj, obj interface{}) {
2626
oldPol := oldObj.(*unstructured.Unstructured)
2727
newPol := obj.(*unstructured.Unstructured)
28-
different, err := areResourcesDifferent(oldPol, newPol)
28+
different, err := areResourcesDifferent(lbc.logger, oldPol, newPol)
2929
if err != nil {
30-
glog.V(3).Infof("Error when comparing policy %v", err)
30+
nl.Debugf(lbc.logger, "Error when comparing policy %v", err)
3131
lbc.AddSyncQueue(newPol)
3232
}
3333
if different {
34-
glog.V(3).Infof("ApPolicy %v changed, syncing", oldPol.GetName())
34+
nl.Debugf(lbc.logger, "ApPolicy %v changed, syncing", oldPol.GetName())
3535
lbc.AddSyncQueue(newPol)
3636
}
3737
},
@@ -46,19 +46,19 @@ func createAppProtectLogConfHandlers(lbc *LoadBalancerController) cache.Resource
4646
handlers := cache.ResourceEventHandlerFuncs{
4747
AddFunc: func(obj interface{}) {
4848
conf := obj.(*unstructured.Unstructured)
49-
glog.V(3).Infof("Adding AppProtectLogConf: %v", conf.GetName())
49+
nl.Debugf(lbc.logger, "Adding AppProtectLogConf: %v", conf.GetName())
5050
lbc.AddSyncQueue(conf)
5151
},
5252
UpdateFunc: func(oldObj, obj interface{}) {
5353
oldConf := oldObj.(*unstructured.Unstructured)
5454
newConf := obj.(*unstructured.Unstructured)
55-
different, err := areResourcesDifferent(oldConf, newConf)
55+
different, err := areResourcesDifferent(lbc.logger, oldConf, newConf)
5656
if err != nil {
57-
glog.V(3).Infof("Error when comparing LogConfs %v", err)
57+
nl.Debugf(lbc.logger, "Error when comparing LogConfs %v", err)
5858
lbc.AddSyncQueue(newConf)
5959
}
6060
if different {
61-
glog.V(3).Infof("ApLogConf %v changed, syncing", oldConf.GetName())
61+
nl.Debugf(lbc.logger, "ApLogConf %v changed, syncing", oldConf.GetName())
6262
lbc.AddSyncQueue(newConf)
6363
}
6464
},
@@ -73,19 +73,19 @@ func createAppProtectUserSigHandlers(lbc *LoadBalancerController) cache.Resource
7373
handlers := cache.ResourceEventHandlerFuncs{
7474
AddFunc: func(obj interface{}) {
7575
sig := obj.(*unstructured.Unstructured)
76-
glog.V(3).Infof("Adding AppProtectUserSig: %v", sig.GetName())
76+
nl.Debugf(lbc.logger, "Adding AppProtectUserSig: %v", sig.GetName())
7777
lbc.AddSyncQueue(sig)
7878
},
7979
UpdateFunc: func(oldObj, obj interface{}) {
8080
oldSig := oldObj.(*unstructured.Unstructured)
8181
newSig := obj.(*unstructured.Unstructured)
82-
different, err := areResourcesDifferent(oldSig, newSig)
82+
different, err := areResourcesDifferent(lbc.logger, oldSig, newSig)
8383
if err != nil {
84-
glog.V(3).Infof("Error when comparing UserSigs %v", err)
84+
nl.Debugf(lbc.logger, "Error when comparing UserSigs %v", err)
8585
lbc.AddSyncQueue(newSig)
8686
}
8787
if different {
88-
glog.V(3).Infof("ApUserSig %v changed, syncing", oldSig.GetName())
88+
nl.Debugf(lbc.logger, "ApUserSig %v changed, syncing", oldSig.GetName())
8989
lbc.AddSyncQueue(newSig)
9090
}
9191
},
@@ -125,7 +125,7 @@ func (nsi *namespacedInformer) addAppProtectUserSigHandler(handlers cache.Resour
125125

126126
func (lbc *LoadBalancerController) syncAppProtectPolicy(task task) {
127127
key := task.Key
128-
glog.V(3).Infof("Syncing AppProtectPolicy %v", key)
128+
nl.Debugf(lbc.logger, "Syncing AppProtectPolicy %v", key)
129129

130130
var obj interface{}
131131
var polExists bool
@@ -142,11 +142,11 @@ func (lbc *LoadBalancerController) syncAppProtectPolicy(task task) {
142142
var problems []appprotect.Problem
143143

144144
if !polExists {
145-
glog.V(2).Infof("Deleting AppProtectPolicy: %v\n", key)
145+
nl.Debugf(lbc.logger, "Deleting AppProtectPolicy: %v\n", key)
146146

147147
changes, problems = lbc.appProtectConfiguration.DeletePolicy(key)
148148
} else {
149-
glog.V(2).Infof("Adding or Updating AppProtectPolicy: %v\n", key)
149+
nl.Debugf(lbc.logger, "Adding or Updating AppProtectPolicy: %v\n", key)
150150

151151
changes, problems = lbc.appProtectConfiguration.AddOrUpdatePolicy(obj.(*unstructured.Unstructured))
152152
}
@@ -157,7 +157,7 @@ func (lbc *LoadBalancerController) syncAppProtectPolicy(task task) {
157157

158158
func (lbc *LoadBalancerController) syncAppProtectLogConf(task task) {
159159
key := task.Key
160-
glog.V(3).Infof("Syncing AppProtectLogConf %v", key)
160+
nl.Debugf(lbc.logger, "Syncing AppProtectLogConf %v", key)
161161
var obj interface{}
162162
var confExists bool
163163
var err error
@@ -173,11 +173,11 @@ func (lbc *LoadBalancerController) syncAppProtectLogConf(task task) {
173173
var problems []appprotect.Problem
174174

175175
if !confExists {
176-
glog.V(2).Infof("Deleting AppProtectLogConf: %v\n", key)
176+
nl.Debugf(lbc.logger, "Deleting AppProtectLogConf: %v\n", key)
177177

178178
changes, problems = lbc.appProtectConfiguration.DeleteLogConf(key)
179179
} else {
180-
glog.V(2).Infof("Adding or Updating AppProtectLogConf: %v\n", key)
180+
nl.Debugf(lbc.logger, "Adding or Updating AppProtectLogConf: %v\n", key)
181181

182182
changes, problems = lbc.appProtectConfiguration.AddOrUpdateLogConf(obj.(*unstructured.Unstructured))
183183
}
@@ -188,7 +188,7 @@ func (lbc *LoadBalancerController) syncAppProtectLogConf(task task) {
188188

189189
func (lbc *LoadBalancerController) syncAppProtectUserSig(task task) {
190190
key := task.Key
191-
glog.V(3).Infof("Syncing AppProtectUserSig %v", key)
191+
nl.Debugf(lbc.logger, "Syncing AppProtectUserSig %v", key)
192192
var obj interface{}
193193
var sigExists bool
194194
var err error
@@ -204,11 +204,11 @@ func (lbc *LoadBalancerController) syncAppProtectUserSig(task task) {
204204
var problems []appprotect.Problem
205205

206206
if !sigExists {
207-
glog.V(2).Infof("Deleting AppProtectUserSig: %v\n", key)
207+
nl.Debugf(lbc.logger, "Deleting AppProtectUserSig: %v\n", key)
208208

209209
change, problems = lbc.appProtectConfiguration.DeleteUserSig(key)
210210
} else {
211-
glog.V(2).Infof("Adding or Updating AppProtectUserSig: %v\n", key)
211+
nl.Debugf(lbc.logger, "Adding or Updating AppProtectUserSig: %v\n", key)
212212

213213
change, problems = lbc.appProtectConfiguration.AddOrUpdateUserSig(obj.(*unstructured.Unstructured))
214214
}
@@ -353,7 +353,7 @@ func (lbc *LoadBalancerController) getAppProtectPolicy(ing *networking.Ingress)
353353
}
354354

355355
func (lbc *LoadBalancerController) processAppProtectChanges(changes []appprotect.Change) {
356-
glog.V(3).Infof("Processing %v App Protect changes", len(changes))
356+
nl.Debugf(lbc.logger, "Processing %v App Protect changes", len(changes))
357357

358358
for _, c := range changes {
359359
if c.Op == appprotect.AddOrUpdate {
@@ -463,13 +463,13 @@ func (lbc *LoadBalancerController) processAppProtectUserSigChange(change appprot
463463

464464
warnings, err := lbc.configurator.RefreshAppProtectUserSigs(change.UserSigs, delPols, allIngExes, allMergeableIngresses, allVsExes)
465465
if err != nil {
466-
glog.Errorf("Error when refreshing App Protect Policy User defined signatures: %v", err)
466+
nl.Errorf(lbc.logger, "Error when refreshing App Protect Policy User defined signatures: %v", err)
467467
}
468468
lbc.updateResourcesStatusAndEvents(allResources, warnings, err)
469469
}
470470

471471
func (lbc *LoadBalancerController) processAppProtectProblems(problems []appprotect.Problem) {
472-
glog.V(3).Infof("Processing %v App Protect problems", len(problems))
472+
nl.Debugf(lbc.logger, "Processing %v App Protect problems", len(problems))
473473

474474
for _, p := range problems {
475475
eventType := api_v1.EventTypeWarning
@@ -479,7 +479,7 @@ func (lbc *LoadBalancerController) processAppProtectProblems(problems []appprote
479479

480480
func (lbc *LoadBalancerController) cleanupUnwatchedAppWafResources(nsi *namespacedInformer) {
481481
for _, obj := range nsi.appProtectPolicyLister.List() {
482-
glog.V(3).Infof("Cleaning up unwatched appprotect policies in namespace: %v", nsi.namespace)
482+
nl.Debugf(lbc.logger, "Cleaning up unwatched appprotect policies in namespace: %v", nsi.namespace)
483483
appPol := obj.((*unstructured.Unstructured))
484484
namespace := appPol.GetNamespace()
485485
name := appPol.GetName()
@@ -489,7 +489,7 @@ func (lbc *LoadBalancerController) cleanupUnwatchedAppWafResources(nsi *namespac
489489
lbc.processAppProtectProblems(problems)
490490
}
491491
for _, obj := range nsi.appProtectLogConfLister.List() {
492-
glog.V(3).Infof("Cleaning up unwatched approtect logconfs in namespace: %v", nsi.namespace)
492+
nl.Debugf(lbc.logger, "Cleaning up unwatched approtect logconfs in namespace: %v", nsi.namespace)
493493
appLogConf := obj.((*unstructured.Unstructured))
494494
namespace := appLogConf.GetNamespace()
495495
name := appLogConf.GetName()
@@ -499,7 +499,7 @@ func (lbc *LoadBalancerController) cleanupUnwatchedAppWafResources(nsi *namespac
499499
lbc.processAppProtectProblems(problems)
500500
}
501501
for _, obj := range nsi.appProtectUserSigLister.List() {
502-
glog.V(3).Infof("Cleaning up unwatched usersigs in namespace: %v", nsi.namespace)
502+
nl.Debugf(lbc.logger, "Cleaning up unwatched usersigs in namespace: %v", nsi.namespace)
503503
appUserSig := obj.((*unstructured.Unstructured))
504504
namespace := appUserSig.GetNamespace()
505505
name := appUserSig.GetName()

0 commit comments

Comments
 (0)