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>
openshift · Jun 28, 2024 · 48ee7cc · 48ee7cc
1 parent 6c5b39a
commit 48ee7cc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/pkg/network/kube_proxy_test.go b/pkg/network/kube_proxy_test.go
@@ -132,6 +132,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 1.2.3.4:999
 mode: blah
@@ -218,6 +220,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: '[fd00:1234::4]:51999'
 mode: blah
@@ -471,6 +475,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 0.0.0.0:29102
 mode: iptables

diff --git a/pkg/network/openshift_sdn_test.go b/pkg/network/openshift_sdn_test.go
@@ -534,6 +534,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 127.0.0.1:29101
 mode: unidling+iptables
@@ -607,6 +609,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 127.0.0.1:29101
 mode: iptables

diff --git a/pkg/util/k8s/kubeproxy_test.go b/pkg/util/k8s/kubeproxy_test.go
@@ -73,6 +73,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 0.0.0.0:9102
 mode: iptables
@@ -150,6 +152,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 5.6.7.8:9999
 mode: userspace
@@ -223,6 +227,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 5.6.7.8:9102
 mode: iptables
@@ -296,6 +302,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 0.0.0.0:9999
 mode: iptables
@@ -374,6 +382,8 @@ logging:
   options:
     json:
       infoBufferSize: "0"
+    text:
+      infoBufferSize: "0"
   verbosity: 0
 metricsBindAddress: 0.0.0.0:9102
 mode: iptables