Skip to content

Commit 48ee7cc

Browse files
committed
fix test issues after 1.30.2 k8s rebase
- component-base log types added a text option in FormatOptions [0] that was not there in 1.29 [1] [0] https://github.com/kubernetes/component-base/blob/244709c58c3669b71514f38c03d08501c690423f/logs/api/v1/types.go#L99 [1] https://github.com/kubernetes/component-base/blob/3c9d29fd4504755d1a42e59053488081604186f4/logs/api/v1/types.go Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
1 parent 6c5b39a commit 48ee7cc

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

pkg/network/kube_proxy_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ logging:
132132
options:
133133
json:
134134
infoBufferSize: "0"
135+
text:
136+
infoBufferSize: "0"
135137
verbosity: 0
136138
metricsBindAddress: 1.2.3.4:999
137139
mode: blah
@@ -218,6 +220,8 @@ logging:
218220
options:
219221
json:
220222
infoBufferSize: "0"
223+
text:
224+
infoBufferSize: "0"
221225
verbosity: 0
222226
metricsBindAddress: '[fd00:1234::4]:51999'
223227
mode: blah
@@ -471,6 +475,8 @@ logging:
471475
options:
472476
json:
473477
infoBufferSize: "0"
478+
text:
479+
infoBufferSize: "0"
474480
verbosity: 0
475481
metricsBindAddress: 0.0.0.0:29102
476482
mode: iptables

pkg/network/openshift_sdn_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,8 @@ logging:
534534
options:
535535
json:
536536
infoBufferSize: "0"
537+
text:
538+
infoBufferSize: "0"
537539
verbosity: 0
538540
metricsBindAddress: 127.0.0.1:29101
539541
mode: unidling+iptables
@@ -607,6 +609,8 @@ logging:
607609
options:
608610
json:
609611
infoBufferSize: "0"
612+
text:
613+
infoBufferSize: "0"
610614
verbosity: 0
611615
metricsBindAddress: 127.0.0.1:29101
612616
mode: iptables

pkg/util/k8s/kubeproxy_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ logging:
7373
options:
7474
json:
7575
infoBufferSize: "0"
76+
text:
77+
infoBufferSize: "0"
7678
verbosity: 0
7779
metricsBindAddress: 0.0.0.0:9102
7880
mode: iptables
@@ -150,6 +152,8 @@ logging:
150152
options:
151153
json:
152154
infoBufferSize: "0"
155+
text:
156+
infoBufferSize: "0"
153157
verbosity: 0
154158
metricsBindAddress: 5.6.7.8:9999
155159
mode: userspace
@@ -223,6 +227,8 @@ logging:
223227
options:
224228
json:
225229
infoBufferSize: "0"
230+
text:
231+
infoBufferSize: "0"
226232
verbosity: 0
227233
metricsBindAddress: 5.6.7.8:9102
228234
mode: iptables
@@ -296,6 +302,8 @@ logging:
296302
options:
297303
json:
298304
infoBufferSize: "0"
305+
text:
306+
infoBufferSize: "0"
299307
verbosity: 0
300308
metricsBindAddress: 0.0.0.0:9999
301309
mode: iptables
@@ -374,6 +382,8 @@ logging:
374382
options:
375383
json:
376384
infoBufferSize: "0"
385+
text:
386+
infoBufferSize: "0"
377387
verbosity: 0
378388
metricsBindAddress: 0.0.0.0:9102
379389
mode: iptables

0 commit comments

Comments
 (0)