Skip to content

Commit ac3ba5a

Browse files
Merge pull request #2185 from openstack-k8s-operators/openstack-dependency-bump/18-stable
openstack-k8s-operators dependency bump branch: 18-stable
2 parents 5c054c7 + 4c17736 commit ac3ba5a

10 files changed

Lines changed: 196 additions & 131 deletions

‎api/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14672,6 +14672,19 @@ spec:
1467214672
manageLbMgmtNetworks:
1467314673
default: true
1467414674
type: boolean
14675+
providerNetworkType:
14676+
default: flat
14677+
enum:
14678+
- flat
14679+
- vlan
14680+
type: string
14681+
providerPhysicalNetwork:
14682+
default: octavia
14683+
type: string
14684+
providerSegmentationID:
14685+
maximum: 4094
14686+
minimum: 1
14687+
type: integer
1467514688
type: object
1467614689
messagingBus:
1467714690
properties:

‎api/go.mod‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ require (
88
github.com/onsi/ginkgo/v2 v2.33.1
99
github.com/onsi/gomega v1.44.0
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261017100150-073cb436de91
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261010071521-cdf5e7c00021
12-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261010071854-973f22bbb0cd
13-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261010071856-cc621b241377
14-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261010071855-0545ba24634e
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261017191403-63582d9b7266
12+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261019070055-e17353692d81
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261017100533-2c5b28c19d6d
14+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261017100909-1d77f7c5043c
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20261017095435-98411ab56b6c
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261017095806-d05fe0c3fce3
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019120010-4f7fe6080c01
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20261017100151-2ee7600b1178
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20261010072248-42f8d7f653a9
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20261019070056-e9a4467c8188
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013084430-51fe9c07def7
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20261013084430-51fe9c07def7
21-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261010072251-05bff7a3edc5
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261013061114-712d836c5ff3
23-
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261010072250-7c59c299abee
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261010081821-985f104882b6
25-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261015063508-0c4700177f38
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261015063509-e11b76377b6e
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261010073044-62f14274092d
28-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261010073044-6e00b8b67f72
29-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261014154653-632235ab6686
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261019065710-51a348318f22
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261017100534-d6c81d8ef44b
23+
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261017100911-624d61fabd3c
24+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261019085556-42ce1210eaed
25+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261019082115-fba1dc001ea3
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261019070056-203b046f2ef8
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261019065714-c187bede1df2
28+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261017101559-184f0c3ff6d1
29+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261019072335-9faeecf0a8fe
3030
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261015063838-d1176e9f1685
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v1.0.0 // indirect
@@ -85,7 +85,7 @@ require (
8585
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8686
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8787
github.com/openshift/api v3.9.0+incompatible // indirect
88-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20261009131357-9ec30866fa66 // indirect
88+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20261013084430-51fe9c07def7 // indirect
8989
github.com/pkg/errors v0.9.1 // indirect
9090
github.com/prometheus/client_golang v1.22.0 // indirect
9191
github.com/prometheus/client_model v0.6.2 // indirect

‎api/go.sum‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -136,46 +136,46 @@ github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 h1:YVY7Mb0AdJBbNgC/Z
136136
github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM=
137137
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261017100150-073cb436de91 h1:SgefPq11pbvDZiZOPu7mU2fg9iu2BgAv1spzXZZHbgM=
138138
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261017100150-073cb436de91/go.mod h1:PwelFZRhRo8dDxkMFCKQ3BdrmXmlmsUTpmH4D7xAvjE=
139-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261010071521-cdf5e7c00021 h1:Hj4YclJ+xkN43PT0Mk4zsJ5A2Nyf7TKIXEWr65pvAec=
140-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261010071521-cdf5e7c00021/go.mod h1:4YtbBmPkBiXnydAZklqyFd+qVOJHMAwbrDFE9itbjpQ=
141-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261010071854-973f22bbb0cd h1:uZzknyzY4gmifHVH35QOXrg/DOtxaScvTZtrtdj5xoI=
142-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261010071854-973f22bbb0cd/go.mod h1:xZjTaFDf/61rfOdSJvVs7oCKxpc1bZWnbN2etw68S9U=
143-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261010071856-cc621b241377 h1:w+QtYMOzwDwLfxtV4dyJaJKtcIS+P3ksuL8275GkVE4=
144-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261010071856-cc621b241377/go.mod h1:RP4rjlcSR386MQSCibc3afqm6h5r/SQ44iAOQGP7C8Y=
145-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261010071855-0545ba24634e h1:saCRpvK9jhYzdWDerujE1mVVg4vdLjtMVKw+db+rSpo=
146-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261010071855-0545ba24634e/go.mod h1:hgqNgP8CkdKgPUfSml4EM8IXeiDDFu8lfKJ4zaZkXfI=
139+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261017191403-63582d9b7266 h1:1/D7QTzkxh+xJxyHcshwCMCTfoeUlrjT1C7wWBAH/ro=
140+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261017191403-63582d9b7266/go.mod h1:kzvRKWwr/wbNNmOAaMBT0KLVX9umgmU5RZWUnTjr4Vk=
141+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261019070055-e17353692d81 h1:SZmt9ymYhjt1xot7cdfIeQIZ6XZaX2WlsiICMBaFJgM=
142+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261019070055-e17353692d81/go.mod h1:q6lzyKl7aT5FqWIfdvmavEvAhEK9QIMmsecLrIExwrM=
143+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261017100533-2c5b28c19d6d h1:5ZJvnW3SEUSB9TYyWO8SbRCT72KTCbD7+69cfDV3Qwg=
144+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261017100533-2c5b28c19d6d/go.mod h1:BNOOJcIY0vqTPOuZFQ9WXUUWWTFJg1ocSuvdxe+ifa4=
145+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261017100909-1d77f7c5043c h1:g8zfQ7rE1q0OBz77sU723Bc/jfoMtvsvgBFzpFHwklY=
146+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261017100909-1d77f7c5043c/go.mod h1:DLEtGKunOfup6izb3bRrLTJ0whsrv2ZvcK5xeWtVBYs=
147147
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20261017095435-98411ab56b6c h1:CXfBtBJ+ZHTJBRySpbYkDTkNzyOQVsKPb8D967Wiu/A=
148148
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20261017095435-98411ab56b6c/go.mod h1:5VppZyxgQ49FMxdJgxlauUdoiPJVPD/vhwrCrGR3XIY=
149-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261017095806-d05fe0c3fce3 h1:FPREB0PxcnKJbbzmtSaYAEPyVlBcqsTO7ctqQY6+ruo=
150-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261017095806-d05fe0c3fce3/go.mod h1:7fwoqvwDeY3N1DCIzw0wd6GYEwUmQ/eWdaXGuc5Ln0A=
149+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019120010-4f7fe6080c01 h1:uIUPRjw4Y5sBqrQDHfeHeZar6Uv+/1ptqhTI6F/pVcY=
150+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019120010-4f7fe6080c01/go.mod h1:7fwoqvwDeY3N1DCIzw0wd6GYEwUmQ/eWdaXGuc5Ln0A=
151151
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20261017100151-2ee7600b1178 h1:VpWQRFnqDMl7RJNACrk//NprcLFkqCat2bVPdNd60fo=
152152
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20261017100151-2ee7600b1178/go.mod h1:y1SXP0iwKxeETuLSSu8+11NewnqueKmwwGy7c89qcvY=
153-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20261010072248-42f8d7f653a9 h1:65OQMrQJI4nyAURvXWTHpSNVAEL4njulppwVzurNYoA=
154-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20261010072248-42f8d7f653a9/go.mod h1:mpKastVpAj/XhUYzDN9wBF3KHXWSesfxg1v+Wp6MZgk=
153+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20261019070056-e9a4467c8188 h1:xiIc1T6s38Rma4MxEwpFt1m3+k9GOztifihFSFgInmI=
154+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20261019070056-e9a4467c8188/go.mod h1:CbDS0Izrp8uY0oWkInjM3vhXSx1t8XPog/g6WAwFhIY=
155155
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013084430-51fe9c07def7 h1:qEb+UxQMZoA/eCFm+QKMonjUnKcGxJDNQZDpdtxTAcQ=
156156
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013084430-51fe9c07def7/go.mod h1:q0N2DU1KwZT+Iez34wwkESeHKHN5pbda8G0Gg2QRWNE=
157-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20261009131357-9ec30866fa66 h1:VLV+5iiW5sIJoz1Iv+fuIlV1W1isTFY+3xBIm5nLE0A=
158-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20261009131357-9ec30866fa66/go.mod h1:0RZQkKhu5jCn7nUOS41YCBMuZA17r0+l8WDHEjAwOjY=
157+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20261013084430-51fe9c07def7 h1:7rT/W9m8Bi0Kmtv5JMLrCsGtulZjUVpjTErtWCQ7b9w=
158+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20261013084430-51fe9c07def7/go.mod h1:0RZQkKhu5jCn7nUOS41YCBMuZA17r0+l8WDHEjAwOjY=
159159
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20261013084430-51fe9c07def7 h1:lDonszu4B0UVQ1Z9xirFUypJ6iwRP5H8ArsMfpEDzo8=
160160
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20261013084430-51fe9c07def7/go.mod h1:zPIkK2aNVGCxyf8Yg2iAaiCH3Wu2G/kjft+CAVs1cgQ=
161-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261010072251-05bff7a3edc5 h1:bDbQvWWormyFQl9kDZMg2onqCWemmqB22/hv8qj/fW4=
162-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261010072251-05bff7a3edc5/go.mod h1:yNjYydrBc7/DpRSu/RvPpp8U/L0bn6x961YR6+wGvwI=
163-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261013061114-712d836c5ff3 h1:lzcCae3lFypUDK6SDSNKZi0WARjSP6gMnPmaLypvfBo=
164-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261013061114-712d836c5ff3/go.mod h1:ydOcxpdszF6tGUElYqBQ3nQFWUvN+MVcAW1v6N1t/90=
165-
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261010072250-7c59c299abee h1:09HSoI86z6y4n8CO0aeq5B3ffcMI3Dc3afEpNMIlDaU=
166-
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261010072250-7c59c299abee/go.mod h1:rM/Ax+pqo3dacFYNXUdFnFRI7YKH45TTIqY1lJbHTvs=
167-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261010081821-985f104882b6 h1:1stE7zBtLXwoOfBj19LNPBSjwFaMeS9pN8rYyqxrC5k=
168-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261010081821-985f104882b6/go.mod h1:X5aYfQDVMX6cIDvQ2IjTm4+ce2zEfHXj+jpE2CvzuWg=
169-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261015063508-0c4700177f38 h1:P/vETW0t4LT9Zwo4EwzgDgsCWfgDmweuDCJgQKlBGAA=
170-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261015063508-0c4700177f38/go.mod h1:KKUbMhnddChUaqrV2gCOPdrxg6tZwuc9WARCZSzLQOw=
171-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261015063509-e11b76377b6e h1:RK8Yz/GDZ/IpeaxLjoprIE0AhqNNzYIs8/onNJBe5/g=
172-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261015063509-e11b76377b6e/go.mod h1:DIuGd45EqnQ8L0CV6AZO47I8KnmS/3p4Tn5t6EXNw9o=
173-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261010073044-62f14274092d h1:q4uoj1LhBvS98JQejzLGVEutMR0FN92lH/3Jn0QOEnQ=
174-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261010073044-62f14274092d/go.mod h1:/YS2DzSot6VY3PZLjW9c1fbLLECG7vKEq0hIbuZx2Sg=
175-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261010073044-6e00b8b67f72 h1:yVUvfz+vFp0zlOcNHZjc38Mdl7OWlMMZ8qEaE7IY+W0=
176-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261010073044-6e00b8b67f72/go.mod h1:w9RdMm4pcTEjX7NfjaXMR/lZeHttm5Shouc0PC1F9p0=
177-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261014154653-632235ab6686 h1:chqI5hG3jFugCvF6ctdbsJlBrHyugK45BxkSt2Di0wI=
178-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261014154653-632235ab6686/go.mod h1:FylXWo9BCHGrtn5j1F0owbYaRVGUmc2dnvspVawdIGg=
161+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261019065710-51a348318f22 h1:/WZxjncVJ7X8wYPZRbc+795Hr6h7owtIohSNlWud3gU=
162+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261019065710-51a348318f22/go.mod h1:pvabclKr+csGi0h84GioDLyR6kxa7mwDoX7N5DowzGg=
163+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261017100534-d6c81d8ef44b h1:XByX5k/x0PtxaNLajZG6VgVGvGCee8XPbS2+4bwmHYk=
164+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261017100534-d6c81d8ef44b/go.mod h1:wuFPy7s5QoLqtbZd2MM2jf8LPfDiYYw79twGhCan6dk=
165+
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261017100911-624d61fabd3c h1:IxZACMoOhkO3ygMNcjeIo3knurRnbU7GvcmC1gGS7Rk=
166+
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261017100911-624d61fabd3c/go.mod h1:YQRa+NShBzTHzHeZr825wW3unHlKfeEEnGo6kBKHtuE=
167+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261019085556-42ce1210eaed h1:Ebw2BlhCu6bZf8QpLC+Ep+7N4qEH2/fwzszHqwhvthc=
168+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261019085556-42ce1210eaed/go.mod h1:QTqhT96pkzRHl2rCgUQ7LAJ/RoJxb2vwIR5Rn1Ls2WM=
169+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261019082115-fba1dc001ea3 h1:gsx+17QMPVHwJ2mcff01lB4y1ny5kkQAcef6CSwbpxY=
170+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261019082115-fba1dc001ea3/go.mod h1:L5bRicuXV6bnyqh65RSl93R7sNI9is7OwRmhRWMYPbA=
171+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261019070056-203b046f2ef8 h1:IZwGQLaT2ht2NBSCiZ2xFAaDpOR+NGp0XOLOa9GXTKM=
172+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261019070056-203b046f2ef8/go.mod h1:gY/e60Wcn41RB7HA7GzxqpSi8UbIBo3FtEjUNJ7zoXA=
173+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261019065714-c187bede1df2 h1:YIXtVfbEotTa3/vdK9gff1CdE4kJaLmppp7LdWTMDcc=
174+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261019065714-c187bede1df2/go.mod h1:e5DpunH0uPKb2y9zMIO2QSSH7GF2SLCiFoet1jeFy8c=
175+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261017101559-184f0c3ff6d1 h1:oLAZ4JLB5AqCqL5Rg5ezs/JSiTUCjXuftF93vn+M18Q=
176+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261017101559-184f0c3ff6d1/go.mod h1:97tcDN8V9evTSWIwVno1gwxkZYug+yz4MsmuRKQQSrg=
177+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261019072335-9faeecf0a8fe h1:t3y4sQ6BFVBc1oCNZtWhx+dVpfZrzhs9+6oahv4daEo=
178+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261019072335-9faeecf0a8fe/go.mod h1:0UCLRTtKHsolnPt2L3TKyJuyt0AtR5DVUixpVR4wYBs=
179179
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261015063838-d1176e9f1685 h1:zvPGHT9gXenPAyAjvzrsDmS0FjFt9CQD3W0MLvPaOyY=
180180
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261015063838-d1176e9f1685/go.mod h1:PokaVHHa3qlfNmoOUq82SQgVlOBDtdZv42nQuJELPe4=
181181
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎bindata/crds/crds.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15206,6 +15206,19 @@ spec:
1520615206
manageLbMgmtNetworks:
1520715207
default: true
1520815208
type: boolean
15209+
providerNetworkType:
15210+
default: flat
15211+
enum:
15212+
- flat
15213+
- vlan
15214+
type: string
15215+
providerPhysicalNetwork:
15216+
default: octavia
15217+
type: string
15218+
providerSegmentationID:
15219+
maximum: 4094
15220+
minimum: 1
15221+
type: integer
1520915222
type: object
1521015223
messagingBus:
1521115224
properties:

‎bindata/crds/octavia.openstack.org_octavias.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,32 @@ spec:
166166
description: ManageLbMgmtNetworks - when True, octavia-operator
167167
creates the Neutron resources needed for its Management Network
168168
type: boolean
169+
providerNetworkType:
170+
default: flat
171+
description: |-
172+
ProviderNetworkType is the Neutron provider network type for the Octavia
173+
provider network. "flat" (default) preserves the in-cluster behaviour;
174+
"vlan" creates a VLAN provider network, e.g. to route the management
175+
network through dedicated Networker nodes.
176+
enum:
177+
- flat
178+
- vlan
179+
type: string
180+
providerPhysicalNetwork:
181+
default: octavia
182+
description: |-
183+
ProviderPhysicalNetwork is the Neutron physical network name backing the
184+
Octavia provider network. Defaults to "octavia" (the in-cluster NIC
185+
mapping); set it to the datacentre physnet when using a VLAN provider
186+
network extended to Networker nodes.
187+
type: string
188+
providerSegmentationID:
189+
description: |-
190+
ProviderSegmentationID is the VLAN ID for the Octavia provider network.
191+
Required when ProviderNetworkType is "vlan"; ignored when "flat".
192+
maximum: 4094
193+
minimum: 1
194+
type: integer
169195
type: object
170196
messagingBus:
171197
description: MessagingBus configuration (cluster, username, and vhost)

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14672,6 +14672,19 @@ spec:
1467214672
manageLbMgmtNetworks:
1467314673
default: true
1467414674
type: boolean
14675+
providerNetworkType:
14676+
default: flat
14677+
enum:
14678+
- flat
14679+
- vlan
14680+
type: string
14681+
providerPhysicalNetwork:
14682+
default: octavia
14683+
type: string
14684+
providerSegmentationID:
14685+
maximum: 4094
14686+
minimum: 1
14687+
type: integer
1467514688
type: object
1467614689
messagingBus:
1467714690
properties:

0 commit comments

Comments
 (0)