Skip to content

Commit e22cb6a

Browse files
authored
bump libovsdb to v0.8.1 (#5596)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 490794c commit e22cb6a

File tree

81 files changed

+260
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+260
-212
lines changed

go.mod

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
github.com/onsi/ginkgo/v2 v2.23.4
3737
github.com/onsi/gomega v1.38.0
3838
github.com/osrg/gobgp/v3 v3.37.0
39-
github.com/ovn-org/libovsdb v0.7.0
39+
github.com/ovn-kubernetes/libovsdb v0.8.1
4040
github.com/parnurzeal/gorequest v0.3.0
4141
github.com/prometheus-community/pro-bing v0.7.0
4242
github.com/prometheus/client_golang v1.23.0
@@ -93,7 +93,6 @@ require (
9393
github.com/beorn7/perks v1.0.1 // indirect
9494
github.com/blang/semver/v4 v4.0.0 // indirect
9595
github.com/buger/jsonparser v1.1.1 // indirect
96-
github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
9796
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
9897
github.com/cenkalti/hub v1.0.2 // indirect
9998
github.com/cenkalti/rpc2 v1.0.4 // indirect
@@ -128,6 +127,7 @@ require (
128127
github.com/felixge/httpsnoop v1.0.4 // indirect
129128
github.com/fsnotify/fsnotify v1.9.0 // indirect
130129
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
130+
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
131131
github.com/getsentry/sentry-go v0.34.1 // indirect
132132
github.com/go-errors/errors v1.5.1 // indirect
133133
github.com/go-kit/kit v0.13.0 // indirect
@@ -137,6 +137,9 @@ require (
137137
github.com/go-openapi/jsonpointer v0.21.1 // indirect
138138
github.com/go-openapi/jsonreference v0.21.0 // indirect
139139
github.com/go-openapi/swag v0.23.1 // indirect
140+
github.com/go-playground/locales v0.14.1 // indirect
141+
github.com/go-playground/universal-translator v0.18.1 // indirect
142+
github.com/go-playground/validator/v10 v10.27.0 // indirect
140143
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
141144
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
142145
github.com/godbus/dbus/v5 v5.1.0 // indirect
@@ -151,7 +154,7 @@ require (
151154
github.com/google/go-cmp v0.7.0 // indirect
152155
github.com/google/gofuzz v1.2.0 // indirect
153156
github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 // indirect
154-
github.com/gorilla/websocket v1.5.3 // indirect
157+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
155158
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
156159
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
157160
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -175,6 +178,7 @@ require (
175178
github.com/kubeovn/dbus/v5 v5.0.0-20250410044920-11a753c7a13f // indirect
176179
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
177180
github.com/kylelemons/godebug v1.1.0 // indirect
181+
github.com/leodido/go-urn v1.4.0 // indirect
178182
github.com/libopenstorage/openstorage v1.0.0 // indirect
179183
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
180184
github.com/lunixbochs/struc v0.0.0-20241101090106-8d528fa2c543 // indirect
@@ -299,18 +303,18 @@ require (
299303
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
300304
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1 // indirect
301305
sigs.k8s.io/gateway-api v1.3.0 // indirect
302-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
303-
sigs.k8s.io/kustomize/api v0.20.0 // indirect
304-
sigs.k8s.io/kustomize/kyaml v0.20.0 // indirect
306+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
307+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
308+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
305309
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
306-
sigs.k8s.io/yaml v1.5.0 // indirect
310+
sigs.k8s.io/yaml v1.6.0 // indirect
307311
)
308312

309313
replace (
310314
github.com/mdlayher/arp => github.com/kubeovn/arp v0.0.0-20240218024213-d9612a263f68
311315
github.com/openshift/api => github.com/openshift/api v0.0.0-20191219222812-2987a591a72c
312316
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
313-
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20241120032411-25ef1bbc83a5
317+
github.com/ovn-kubernetes/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20250813021149-b90b9286a01a
314318
k8s.io/api => k8s.io/api v0.32.7
315319
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.7
316320
k8s.io/apimachinery => k8s.io/apimachinery v0.32.7
@@ -344,3 +348,5 @@ replace (
344348
)
345349

346350
tool go.uber.org/mock/mockgen
351+
352+
tool github.com/ovn-kubernetes/libovsdb/cmd/modelgen

go.sum

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZ
4545
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
4646
github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
4747
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
48-
github.com/carapace-sh/carapace-shlex v1.0.1 h1:ww0JCgWpOVuqWG7k3724pJ18Lq8gh5pHQs9j3ojUs1c=
49-
github.com/carapace-sh/carapace-shlex v1.0.1/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M=
5048
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
5149
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
5250
github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
@@ -171,6 +169,8 @@ github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8
171169
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
172170
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
173171
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
172+
github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
173+
github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
174174
github.com/getsentry/sentry-go v0.34.1 h1:HSjc1C/OsnZttohEPrrqKH42Iud0HuLCXpv8cU1pWcw=
175175
github.com/getsentry/sentry-go v0.34.1/go.mod h1:C55omcY9ChRQIUcVcGcs+Zdy4ZpQGvNJ7JYHIoSWOtE=
176176
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
@@ -217,6 +217,14 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+
217217
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
218218
github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
219219
github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
220+
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
221+
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
222+
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
223+
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
224+
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
225+
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
226+
github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
227+
github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
220228
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
221229
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
222230
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
@@ -304,8 +312,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
304312
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
305313
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
306314
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
307-
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
308-
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
315+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
316+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
309317
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
310318
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
311319
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
@@ -402,15 +410,17 @@ github.com/kubeovn/gonetworkmanager/v3 v3.0.0-20250410050455-ce7c8d9ddfb1 h1:KK9
402410
github.com/kubeovn/gonetworkmanager/v3 v3.0.0-20250410050455-ce7c8d9ddfb1/go.mod h1:U2a1lvv3fgbO96u9d40IOS8YWTtPjUSJSxcJlAmCyL8=
403411
github.com/kubeovn/kubevirt-client-go v0.0.0-20250507014510-dc51721a96f1 h1:1YNDKeqFhZWXjkghX7UVr1wPREeJk9u53OCLy8x7K98=
404412
github.com/kubeovn/kubevirt-client-go v0.0.0-20250507014510-dc51721a96f1/go.mod h1:DVrs1zLknNZdh84KbAZvQlW2sxvcMF8DnkCBeddM7JU=
405-
github.com/kubeovn/libovsdb v0.0.0-20241120032411-25ef1bbc83a5 h1:JAw5BShtjd8o8+3wsdlbzt9dLUbIIY5DuhAMrdfM/zk=
406-
github.com/kubeovn/libovsdb v0.0.0-20241120032411-25ef1bbc83a5/go.mod h1:od3agzU0e50RPBxap7mMvBWZ+u37kqX0W849BYufdHI=
413+
github.com/kubeovn/libovsdb v0.0.0-20250813021149-b90b9286a01a h1:HjiIrJfGYd0/5tU8yNWM6kDsjy6aXECOMigo3c6GTkA=
414+
github.com/kubeovn/libovsdb v0.0.0-20250813021149-b90b9286a01a/go.mod h1:xW9NlJGFs7WbKhzym7NFDhGqYeFM9KmtDnpcgvQG/LM=
407415
github.com/kubeovn/ovsdb v0.0.0-20240410091831-5dd26006c475 h1:KZba2Kj9TXCUdUSqOR3eiy4VvkkIyhDVImYmYs6GQWU=
408416
github.com/kubeovn/ovsdb v0.0.0-20240410091831-5dd26006c475/go.mod h1:LAd0qoeAAm/QyZcpxN2BnpndM2/dhZt+/kokPvcxKcE=
409417
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyPlUHk/ofpgvBcNcawJLtf4PYHORLjAA=
410418
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
411419
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
412420
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
413421
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
422+
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
423+
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
414424
github.com/libopenstorage/openstorage v1.0.0 h1:GLPam7/0mpdP8ZZtKjbfcXJBTIA/T1O6CBErVEFEyIM=
415425
github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
416426
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
@@ -1245,12 +1255,12 @@ sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
12451255
sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
12461256
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
12471257
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
1248-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
1249-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
1250-
sigs.k8s.io/kustomize/api v0.20.0 h1:xPLqcobHI0bThyRUteO+nCV8G4d1Rlo5HafO57VRcas=
1251-
sigs.k8s.io/kustomize/api v0.20.0/go.mod h1:F6CfaV27oevRCMJgehLqyX81dlUnRX/Fc13Uo7+OSo4=
1252-
sigs.k8s.io/kustomize/kyaml v0.20.0 h1:tT8KMKi4R3hCJ1+9HDdek2VoXpkerP92ZfF6fDgGw14=
1253-
sigs.k8s.io/kustomize/kyaml v0.20.0/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
1258+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
1259+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
1260+
sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I=
1261+
sigs.k8s.io/kustomize/api v0.20.1/go.mod h1:t6hUFxO+Ph0VxIk1sKp1WS0dOjbPCtLJ4p8aADLwqjM=
1262+
sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A78=
1263+
sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
12541264
sigs.k8s.io/network-policy-api v0.1.5 h1:xyS7VAaM9EfyB428oFk7WjWaCK6B129i+ILUF4C8l6E=
12551265
sigs.k8s.io/network-policy-api v0.1.5/go.mod h1:D7Nkr43VLNd7iYryemnj8qf0N/WjBzTZDxYA+g4u1/Y=
12561266
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
@@ -1262,5 +1272,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vt
12621272
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
12631273
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
12641274
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
1265-
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
1266-
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
1275+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
1276+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

hack/modelgen.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#! /usr/bin/env bash
2+
3+
set -o errexit
4+
set -o nounset
5+
set -o pipefail
6+
7+
OVN_VERSION="25.03"
8+
9+
# download ovn nb/sb schema files
10+
curl -sSf -L --retry 5 -o ovn-nb.ovsschema \
11+
https://raw.githubusercontent.com/ovn-org/ovn/refs/heads/branch-${OVN_VERSION}/ovn-nb.ovsschema
12+
curl -sSf -L --retry 5 -o ovn-sb.ovsschema \
13+
https://raw.githubusercontent.com/ovn-org/ovn/refs/heads/branch-${OVN_VERSION}/ovn-sb.ovsschema
14+
15+
# remove old generated files
16+
rm -rf pkg/ovsdb/ovnnb pkg/ovsdb/ovnsb
17+
18+
# generate go code from ovn nb/sb schema files
19+
go tool github.com/ovn-kubernetes/libovsdb/cmd/modelgen \
20+
-p ovnnb -o pkg/ovsdb/ovnnb ovn-nb.ovsschema
21+
go tool github.com/ovn-kubernetes/libovsdb/cmd/modelgen \
22+
-p ovnsb -o pkg/ovsdb/ovnsb ovn-sb.ovsschema
23+
24+
# remove downloaded schema files
25+
rm -f ovn-nb.ovsschema ovn-sb.ovsschema
26+
27+
# add generated files to git
28+
git add pkg/ovsdb/ovnnb pkg/ovsdb/ovnsb

mocks/pkg/ovs/interface.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/controller/config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@ func ParseFlags() (*Configuration, error) {
304304
TLSMaxVersion: *argTLSMaxVersion,
305305
TLSCipherSuites: *argTLSCipherSuites,
306306
}
307+
if config.OvsDbConnectTimeout >= config.OvsDbInactivityTimeout {
308+
return nil, errors.New("OVS DB inactivity timeout value should be greater than reconnect timeout value")
309+
}
307310

308311
if config.NetworkType == util.NetworkTypeVlan && config.DefaultHostInterface == "" {
309312
return nil, errors.New("no host nic for vlan")

pkg/controller/gc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
1111
nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils"
12-
"github.com/ovn-org/libovsdb/ovsdb"
12+
"github.com/ovn-kubernetes/libovsdb/ovsdb"
1313
"github.com/scylladb/go-set/strset"
1414
corev1 "k8s.io/api/core/v1"
1515
k8serrors "k8s.io/apimachinery/pkg/api/errors"

pkg/controller/ovn_dnat.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"net"
88

9-
"github.com/ovn-org/libovsdb/ovsdb"
9+
"github.com/ovn-kubernetes/libovsdb/ovsdb"
1010
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/apimachinery/pkg/labels"

pkg/controller/subnet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"strings"
1515
"time"
1616

17-
"github.com/ovn-org/libovsdb/ovsdb"
17+
"github.com/ovn-kubernetes/libovsdb/ovsdb"
1818
v1 "k8s.io/api/core/v1"
1919
k8serrors "k8s.io/apimachinery/pkg/api/errors"
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/ovs/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
netv1 "k8s.io/api/networking/v1"
77

8-
"github.com/ovn-org/libovsdb/ovsdb"
8+
"github.com/ovn-kubernetes/libovsdb/ovsdb"
99

1010
v1alpha1 "sigs.k8s.io/network-policy-api/apis/v1alpha1"
1111

pkg/ovs/ovn-nb-acl.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strconv"
99
"strings"
1010

11-
"github.com/ovn-org/libovsdb/model"
12-
"github.com/ovn-org/libovsdb/ovsdb"
11+
"github.com/ovn-kubernetes/libovsdb/model"
12+
"github.com/ovn-kubernetes/libovsdb/ovsdb"
1313
netv1 "k8s.io/api/networking/v1"
1414
"k8s.io/apimachinery/pkg/util/intstr"
1515
"k8s.io/klog/v2"

0 commit comments

Comments
 (0)