Skip to content

Commit f9190bf

Browse files
authored
Merge pull request k8snetworkplumbingwg#922 from adrianchiris/bump-libovsdb
chore: bump libovsdb lib
2 parents 4c5f5af + 2161462 commit f9190bf

File tree

5 files changed

+54
-37
lines changed

5 files changed

+54
-37
lines changed

go.mod

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require (
1010
github.com/cenkalti/backoff v2.2.1+incompatible
1111
github.com/coreos/go-systemd/v22 v22.5.0
1212
github.com/fsnotify/fsnotify v1.8.0
13-
github.com/go-logr/logr v1.4.2
13+
github.com/go-logr/logr v1.4.3
1414
github.com/go-logr/stdr v1.2.2
15-
github.com/google/go-cmp v0.6.0
15+
github.com/google/go-cmp v0.7.0
1616
github.com/google/renameio/v2 v2.0.0
1717
github.com/google/uuid v1.6.0
1818
github.com/hashicorp/go-retryablehttp v0.7.7
@@ -27,7 +27,7 @@ require (
2727
github.com/openshift/api v0.0.0-20250227152946-1ee1ef831100
2828
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
2929
github.com/openshift/machine-config-operator v0.0.1-0.20250320230514-53e78f3692ee
30-
github.com/ovn-org/libovsdb v0.6.1-0.20240125124854-03f787b1a892
30+
github.com/ovn-kubernetes/libovsdb v0.8.1
3131
github.com/pkg/errors v0.9.1
3232
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
3333
github.com/prometheus-operator/prometheus-operator/pkg/client v0.68.0
@@ -66,8 +66,8 @@ require (
6666
github.com/beorn7/perks v1.0.1 // indirect
6767
github.com/blang/semver/v4 v4.0.0 // indirect
6868
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
69-
github.com/cenkalti/hub v1.0.1 // indirect
70-
github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 // indirect
69+
github.com/cenkalti/hub v1.0.2 // indirect
70+
github.com/cenkalti/rpc2 v1.0.4 // indirect
7171
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7272
github.com/chai2010/gettext-go v1.0.2 // indirect
7373
github.com/clarketm/json v1.17.1 // indirect
@@ -85,13 +85,17 @@ require (
8585
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
8686
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
8787
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
88+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
8889
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
8990
github.com/go-errors/errors v1.4.2 // indirect
9091
github.com/go-logr/zapr v1.3.0 // indirect
9192
github.com/go-ole/go-ole v1.2.6 // indirect
9293
github.com/go-openapi/jsonpointer v0.21.0 // indirect
9394
github.com/go-openapi/jsonreference v0.21.0 // indirect
9495
github.com/go-openapi/swag v0.23.0 // indirect
96+
github.com/go-playground/locales v0.14.1 // indirect
97+
github.com/go-playground/universal-translator v0.18.1 // indirect
98+
github.com/go-playground/validator/v10 v10.26.0 // indirect
9599
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
96100
github.com/gogo/protobuf v1.3.2 // indirect
97101
github.com/golang/glog v1.2.4 // indirect
@@ -110,9 +114,9 @@ require (
110114
github.com/josharian/intern v1.0.0 // indirect
111115
github.com/json-iterator/go v1.1.12 // indirect
112116
github.com/k8snetworkplumbingwg/govdpa v0.1.4 // indirect
113-
github.com/klauspost/compress v1.17.11 // indirect
114117
github.com/kr/pretty v0.3.1 // indirect
115118
github.com/kr/text v0.2.0 // indirect
119+
github.com/leodido/go-urn v1.4.0 // indirect
116120
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
117121
github.com/mailru/easyjson v0.9.0 // indirect
118122
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -129,7 +133,7 @@ require (
129133
github.com/openshift/library-go v0.0.0-20250129210218-fe56c2cf5d70 // indirect
130134
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
131135
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
132-
github.com/prometheus/client_golang v1.20.5 // indirect
136+
github.com/prometheus/client_golang v1.22.0 // indirect
133137
github.com/prometheus/procfs v0.15.1 // indirect
134138
github.com/robfig/cron v1.2.0 // indirect
135139
github.com/rogpeppe/go-internal v1.13.1 // indirect
@@ -159,7 +163,7 @@ require (
159163
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
160164
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
161165
google.golang.org/grpc v1.69.4 // indirect
162-
google.golang.org/protobuf v1.36.4 // indirect
166+
google.golang.org/protobuf v1.36.5 // indirect
163167
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
164168
gopkg.in/inf.v0 v0.9.1 // indirect
165169
gopkg.in/yaml.v2 v2.4.0 // indirect

go.sum

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,14 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
2929
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
3030
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
3131
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
32-
github.com/cenk/hub v1.0.1 h1:RBwXNOF4a8KjD8BJ08XqN8KbrqaGiQLDrgvUGJSHuPA=
33-
github.com/cenk/hub v1.0.1/go.mod h1:rJM1LNAW0ppT8FMMuPK6c2NP/R2nH/UthtuRySSaf6Y=
3432
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
3533
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
3634
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
3735
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
38-
github.com/cenkalti/hub v1.0.1 h1:UMtjc6dHSaOQTO15SVA50MBIR9zQwvsukQupDrkIRtg=
39-
github.com/cenkalti/hub v1.0.1/go.mod h1:tcYwtS3a2d9NO/0xDXVJWx3IedurUjYCqFCmpi0lpHs=
40-
github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 h1:CNwZyGS6KpfaOWbh2yLkSy3rSTUh3jub9CzpFpP6PVQ=
41-
github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984/go.mod h1:v2npkhrXyk5BCnkNIiPdRI23Uq6uWPUQGL2hnRcRr/M=
36+
github.com/cenkalti/hub v1.0.2 h1:Nqv9TNaA9boeO2wQFW8o87BY3zKthtnzXmWGmJqhAV8=
37+
github.com/cenkalti/hub v1.0.2/go.mod h1:8LAFAZcCasb83vfxatMUnZHRoQcffho2ELpHb+kaTJU=
38+
github.com/cenkalti/rpc2 v1.0.4 h1:MJWmm7mbt8r/ZkQS+qr/e2KMMrhMLPr/62CYZIHybdI=
39+
github.com/cenkalti/rpc2 v1.0.4/go.mod h1:2yfU5b86vOr16+iY1jN3MvT6Kxc9Nf8j5iZWwUf7iaw=
4240
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
4341
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
4442
github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk=
@@ -99,13 +97,15 @@ github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/
9997
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
10098
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
10199
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
100+
github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
101+
github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
102102
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
103103
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
104104
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
105105
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
106106
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
107-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
108-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
107+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
108+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
109109
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
110110
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
111111
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -119,6 +119,14 @@ github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF
119119
github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
120120
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
121121
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
122+
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
123+
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
124+
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
125+
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
126+
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
127+
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
128+
github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
129+
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
122130
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
123131
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
124132
github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
@@ -134,8 +142,8 @@ github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl76
134142
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
135143
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
136144
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
137-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
138-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
145+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
146+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
139147
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
140148
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
141149
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -189,8 +197,8 @@ github.com/k8snetworkplumbingwg/sriovnet v1.2.0 h1:6ELfAxCB1dvosGUy3DVRmfH+HWTzm
189197
github.com/k8snetworkplumbingwg/sriovnet v1.2.0/go.mod h1:jyWzGe6ZtYiPq6ih6aXCOy6mZ49Y9mNyBOLBBXnli+k=
190198
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
191199
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
192-
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
193-
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
200+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
201+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
194202
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
195203
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
196204
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -202,6 +210,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
202210
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
203211
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
204212
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
213+
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
214+
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
205215
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
206216
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
207217
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
@@ -255,8 +265,8 @@ github.com/openshift/library-go v0.0.0-20250129210218-fe56c2cf5d70 h1:VLj8CU9q00
255265
github.com/openshift/library-go v0.0.0-20250129210218-fe56c2cf5d70/go.mod h1:TQx0VEhZ/92qRXIMDu2Wg4bUPmw5HRNE6wpSZ+IsP0Y=
256266
github.com/openshift/machine-config-operator v0.0.1-0.20250320230514-53e78f3692ee h1:ITOXo9zrpzl68qrzh/+1uRJlbpMl88jETfWfFyIa3uU=
257267
github.com/openshift/machine-config-operator v0.0.1-0.20250320230514-53e78f3692ee/go.mod h1:ZA2cpM5ol3zcxRpG4gQr+XSlEQJe732noPWcMz6MQ4k=
258-
github.com/ovn-org/libovsdb v0.6.1-0.20240125124854-03f787b1a892 h1:/yg3/z+RH+iDLMxp6FTnmlk5bStK542/Rge5EBjnA9A=
259-
github.com/ovn-org/libovsdb v0.6.1-0.20240125124854-03f787b1a892/go.mod h1:LC5DOvcY58jOG3HTvDyCVidoMJDurPeu+xlxv5Krd9Q=
268+
github.com/ovn-kubernetes/libovsdb v0.8.1 h1:M2J8bcJt5mXCom0HqzfEtuHkT80CTSQRcYG7acT8gf4=
269+
github.com/ovn-kubernetes/libovsdb v0.8.1/go.mod h1:ZlnHLzagmLOSvyd9qfxBIZp6wOSOw0IsRsc+6lNUGbU=
260270
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
261271
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
262272
github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY=
@@ -272,8 +282,8 @@ github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 h
272282
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0/go.mod h1:wAR5JopumPtAZnu0Cjv2PSqV4p4QB09LMhc6fZZTXuA=
273283
github.com/prometheus-operator/prometheus-operator/pkg/client v0.68.0 h1:8FS0sXpFkFPxp2gfkxyEMnhZV9yhf7xPbpsIeUZHlzM=
274284
github.com/prometheus-operator/prometheus-operator/pkg/client v0.68.0/go.mod h1:ul4ND0BMCcOX1OSZvbJA1/lh7yQ2ILHNKuZIojGISe4=
275-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
276-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
285+
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
286+
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
277287
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
278288
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
279289
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
@@ -417,8 +427,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:
417427
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
418428
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
419429
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
420-
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
421-
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
430+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
431+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
422432
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
423433
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
424434
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

pkg/host/internal/bridge/ovs/models.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ovs
33
import (
44
"slices"
55

6-
"github.com/ovn-org/libovsdb/model"
6+
"github.com/ovn-kubernetes/libovsdb/model"
77
)
88

99
// OpenvSwitchEntry represents some fields of the object in the Open_vSwitch table

pkg/host/internal/bridge/ovs/ovs.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/go-logr/logr"
1414
"github.com/google/uuid"
15-
"github.com/ovn-org/libovsdb/client"
16-
"github.com/ovn-org/libovsdb/model"
17-
"github.com/ovn-org/libovsdb/ovsdb"
15+
"github.com/ovn-kubernetes/libovsdb/client"
16+
"github.com/ovn-kubernetes/libovsdb/model"
17+
"github.com/ovn-kubernetes/libovsdb/ovsdb"
1818
"k8s.io/apimachinery/pkg/api/equality"
1919
"sigs.k8s.io/controller-runtime/pkg/log"
2020

pkg/host/internal/bridge/ovs/ovs_test.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import (
99
"time"
1010

1111
"github.com/google/uuid"
12-
"github.com/ovn-org/libovsdb/client"
13-
"github.com/ovn-org/libovsdb/database/inmemory"
14-
"github.com/ovn-org/libovsdb/model"
15-
"github.com/ovn-org/libovsdb/ovsdb"
16-
"github.com/ovn-org/libovsdb/server"
12+
"github.com/ovn-kubernetes/libovsdb/client"
13+
"github.com/ovn-kubernetes/libovsdb/database/inmemory"
14+
"github.com/ovn-kubernetes/libovsdb/model"
15+
"github.com/ovn-kubernetes/libovsdb/ovsdb"
16+
"github.com/ovn-kubernetes/libovsdb/server"
1717
"go.uber.org/mock/gomock"
18+
"sigs.k8s.io/controller-runtime/pkg/log"
1819

1920
. "github.com/onsi/ginkgo/v2"
2021
. "github.com/onsi/gomega"
@@ -637,13 +638,15 @@ func startServer(protocol, path string) func() {
637638
clientDBModels, err := DatabaseModel()
638639
Expect(err).NotTo(HaveOccurred())
639640
schema := getSchema()
641+
642+
ovslog := log.Log.WithName("ovs")
640643
ovsDB := inmemory.NewDatabase(map[string]model.ClientDBModel{
641644
schema.Name: clientDBModels,
642-
})
645+
}, &ovslog)
643646

644647
dbModel, errs := model.NewDatabaseModel(schema, clientDBModels)
645648
Expect(errs).To(BeEmpty())
646-
s, err := server.NewOvsdbServer(ovsDB, dbModel)
649+
s, err := server.NewOvsdbServer(ovsDB, nil, dbModel)
647650
Expect(err).NotTo(HaveOccurred())
648651

649652
stopped := make(chan struct{})

0 commit comments

Comments
 (0)