Skip to content

Commit 12b025e

Browse files
Merge pull request #2118 from openstack-k8s-operators/openstack-dependency-bump/18-stable
openstack-k8s-operators dependency bump branch: 18-stable
2 parents 745d839 + 19246a3 commit 12b025e

11 files changed

Lines changed: 117 additions & 82 deletions

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4264,14 +4264,15 @@ spec:
42644264
- local-ttl
42654265
- dhcp-ttl
42664266
- max-ttl
4267+
- log-queries
4268+
- log-debug
42674269
type: string
42684270
values:
42694271
items:
42704272
type: string
42714273
type: array
42724274
required:
42734275
- key
4274-
- values
42754276
type: object
42764277
type: array
42774278
override:
@@ -11388,6 +11389,13 @@ spec:
1138811389
default: 9932
1138911390
format: int32
1139011391
type: integer
11392+
logLevel:
11393+
default: debug
11394+
enum:
11395+
- none
11396+
- verbose
11397+
- debug
11398+
type: string
1139111399
maxConn:
1139211400
default: 8192
1139311401
format: int32

‎api/go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ require (
66
github.com/cert-manager/cert-manager v1.18.6
77
github.com/go-playground/validator/v10 v10.30.3
88
github.com/onsi/ginkgo/v2 v2.33.0
9-
github.com/onsi/gomega v1.43.1
9+
github.com/onsi/gomega v1.44.0
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260921094053-c6508616faa0
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260921090038-2da0faa51b86
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260926072237-f41f74666cbe
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260921091538-7f28b424b2a7
13-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260921090036-1be75de9368a
14-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260921100702-39c7e63256f2
15-
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260921085553-59c8be4e6c5e
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260921093008-99efbdcf9d2e
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260926072236-052312c19a0b
14+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260924034856-bb6aeeb7403a
15+
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260926063706-7516034961b9
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260925072056-d5c599ea583f
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260922074234-732c01da98d0
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260921095541-9df26f06c330
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260920095155-a193dedd4c06
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260920095155-a193dedd4c06
21-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260921085553-1899d27d94f1
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260926065612-c5bb81f1d26c
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260921092302-77b4e6de3fa2
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260921085552-005767eaac52
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260921090811-4fca19db4c8c
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260922140051-5f8232376795
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260921091151-d35cadc3d360
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260921085553-a587d7c46860
28-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260921085205-321ec13ce39e
29-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260923074746-9b3285f764fb
30-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260921070611-7b191e3a77c3
28+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260926065256-c82b91b7aef1
29+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260925142839-bc557ac2d917
30+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260923093806-be64bf3cea4d
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
3333
go.uber.org/multierr v1.11.0 // indirect

‎api/go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -130,24 +130,24 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
130130
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
131131
github.com/onsi/ginkgo/v2 v2.33.0 h1:C8gBA6Uc2ZEubiV+SXiu5tZnMTwEmXHgkJwGozKtZf8=
132132
github.com/onsi/ginkgo/v2 v2.33.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
133-
github.com/onsi/gomega v1.43.1 h1:vGIPFuYrIO6/0Z09s0I0QQQgFchiX4+tb1re3MScJYo=
134-
github.com/onsi/gomega v1.43.1/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA=
133+
github.com/onsi/gomega v1.44.0 h1:eAiGl3Pw5jz5GQdDff0BcxYpAX1JxW8xD7mFUuwNfZQ=
134+
github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA=
135135
github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 h1:YVY7Mb0AdJBbNgC/Zz9R/ZwhixOmZNA8P+6ZPaDW/0M=
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.20260921094053-c6508616faa0 h1:1QTB2q0VRYyAHm5ss1+zocm9BTlvzBd9V0Rmi0FKU3g=
138138
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260921094053-c6508616faa0/go.mod h1:jAwtnk9wNRt0hYEq5ohgF560SQ8Tu9478NfjyVhgtwg=
139-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260921090038-2da0faa51b86 h1:/XAC7P8VLzAd/Un52MRoL5QiGlF7Dr+5J8j23vxtzNA=
140-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260921090038-2da0faa51b86/go.mod h1:LKz9RwRU1UbO79Ko+Prs9Bw2+oEPg292CjyQ7yMf7gM=
139+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260926072237-f41f74666cbe h1:V4Bo/g0PUXLnzY+be+f9dzTyyRJL2mTMJhxU1nznXbI=
140+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260926072237-f41f74666cbe/go.mod h1:XmOV8TkXAL193Uakn6g9EobgaNiqJmuR4UXqICYpvOk=
141141
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260921091538-7f28b424b2a7 h1:CEoo4gzlNw/NNtG636odW0DzYvOmcDOiFxSRLuasVcE=
142142
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260921091538-7f28b424b2a7/go.mod h1:v8aYzTuymIHdXHiIah0m4s2KwuDFRacE0ezrq4bgAlY=
143-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260921090036-1be75de9368a h1:Bp7aPoPx0urA6iXjhtC4fhWouLpxRxGeJ/KqtO6mIq8=
144-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260921090036-1be75de9368a/go.mod h1:Dz8ohQTevabpX0bpkA0D6PLqkwpF2eIdj7bsweWbNOg=
145-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260921100702-39c7e63256f2 h1:y46F2SOosnfjZe5oKAoIFhG+6i3rvcqKiSpFSgAAMRg=
146-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260921100702-39c7e63256f2/go.mod h1:Muh2ugyQFh5v7Rm56WL7BlUgJ2XRcebBvtaOZ+okJmg=
147-
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260921085553-59c8be4e6c5e h1:JiYSuLdEOqlS4HCXA7V9NPeNw1ffWwlee9WUQNE7WRs=
148-
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260921085553-59c8be4e6c5e/go.mod h1:ee41Ufh4qugtnX/FMOISfJVidGSyYYyUMByBa2ATLOc=
149-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260921093008-99efbdcf9d2e h1:H0VpRxqwUGbOmX167ELmL1X6YovKrUz6fChBWTZ9DvU=
150-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260921093008-99efbdcf9d2e/go.mod h1:eSbnr2Oh6tHv4Lz60ea3SXCee7xDaZwxFTZQz81iuEI=
143+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260926072236-052312c19a0b h1:I0lLbxphI6GcMZYV4IXuLpqarI5mGzGMr/NX1Q4nWuo=
144+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260926072236-052312c19a0b/go.mod h1:4FueFTDcoEl05ZbZ5B9XlC++/pbwL+rm//lXhyw1ZfQ=
145+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260924034856-bb6aeeb7403a h1:eReYs49epaiTuCGrislmifZuWJ5I3ynHaVDSYE2Iw1k=
146+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260924034856-bb6aeeb7403a/go.mod h1:Muh2ugyQFh5v7Rm56WL7BlUgJ2XRcebBvtaOZ+okJmg=
147+
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260926063706-7516034961b9 h1:GATPQGedmwnaPbT7faCyFP8XBiEk5ApvxxHyfDjPipo=
148+
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260926063706-7516034961b9/go.mod h1:jrun18sE+A1HqEMHs/yjpAy0VpayqoecyJZTiVeHvdg=
149+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260925072056-d5c599ea583f h1:tJ7gAkFWzHOL/96IkVG7A1Trry1kFrJlKEZaYklHXP4=
150+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260925072056-d5c599ea583f/go.mod h1:eSbnr2Oh6tHv4Lz60ea3SXCee7xDaZwxFTZQz81iuEI=
151151
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260922074234-732c01da98d0 h1:7ESbJxxB8YoMWkuiNdjte8QdG2l7lY55SycYavDFkzw=
152152
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260922074234-732c01da98d0/go.mod h1:mK1ptJB+OyUT6qN0uYoVcMP6ojSkhVcN9NVspeuNa8g=
153153
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260921095541-9df26f06c330 h1:kFgA9yERAhP5mHgHWIE9hEFl9tDnW7J1dSH9RPVPXJI=
@@ -158,8 +158,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.2026090
158158
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260906094540-d1f379df10ce/go.mod h1:SIe+Z2sT90koldAkQnY7eLnHrg6EutLBsq3BZ2Iha8Y=
159159
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260920095155-a193dedd4c06 h1:ffyynRjp1O20mgSyVmOWsTVZKm8ypK0sR/BNb8FYQw0=
160160
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260920095155-a193dedd4c06/go.mod h1:oTbAosub7Bxx6amLCZW6YZ13aTulG3u4H+pdQ+15pFk=
161-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260921085553-1899d27d94f1 h1:u5Llhi/Fgpv8kSFaGX0jfz7dPzhOhENy4S+TAAzWWpg=
162-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260921085553-1899d27d94f1/go.mod h1:iJiUmkVgVrQCj/lYT+FvNoVQQdF00p0R9EtAWe2bRlM=
161+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260926065612-c5bb81f1d26c h1:egK4EJ21wAWeyHm6/81hNQRxG/mQE/K7JyCTZuxGjCA=
162+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260926065612-c5bb81f1d26c/go.mod h1:b8cldUSg2YgeV1Cy0DQewnj2VDSYDu79mA7795wCk7c=
163163
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260921092302-77b4e6de3fa2 h1:zBSGBvPT/HOqukrzwEmYL0J0f+56VB3RFGRsKaMxA7Y=
164164
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260921092302-77b4e6de3fa2/go.mod h1:RivmXBtZx+AHc0f8TF4Tgo6ySqSnwGtRbLnotxVXeqg=
165165
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260921085552-005767eaac52 h1:0d6fPjd0Gaj8vfOPY7Ryg0oqy6c81x66ZhM5mn0oQQI=
@@ -172,12 +172,12 @@ github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.202
172172
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260921091151-d35cadc3d360/go.mod h1:3Ihxxl8mDCiC32ZHIqFj1HIWsWIz0k42G/jDUrssw30=
173173
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260921085553-a587d7c46860 h1:QZn2/BgqXIq10huNjkV3iNtJO98lSpt+AKzyX9bKpgs=
174174
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260921085553-a587d7c46860/go.mod h1:Yw3LM+IELWxgNTFNwv3rGr7GWhLQhBp6UtciU5t6hiY=
175-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260921085205-321ec13ce39e h1:zFyGsPKAPULGR3OrJjAp/JWvKVIzGHQCV7PAct+3UFA=
176-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260921085205-321ec13ce39e/go.mod h1:s9dy+ar1LAVGY389oAyGwk29zGvMrwcjNdgzQ2hpBbk=
177-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260923074746-9b3285f764fb h1:wLQQN3kyBmicArgEWfycBYeTAV8zyIze+lz8zlyEQQ0=
178-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260923074746-9b3285f764fb/go.mod h1:jZioag+mpkEyn9C5N+ZYP5vX+wjzQyiwRSFKv1Swq9I=
179-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260921070611-7b191e3a77c3 h1:Ndz/Dmx1r1xJtUF8Nv51UU+iQNEn0K/Ps4PP3CBf8Fw=
180-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260921070611-7b191e3a77c3/go.mod h1:vjzWYeh4Enqq/VkBaduzRWJNJIDCiGKl7OEMZXsyiO8=
175+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260926065256-c82b91b7aef1 h1:WxNmJczL15VV9psLXFbUOgvnGpEEpmOsovFdw8fWVO0=
176+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260926065256-c82b91b7aef1/go.mod h1:pqe+OsZzmGp2YWX++XP9bcgyHeoVaXHcBbdAyF5sjEI=
177+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260925142839-bc557ac2d917 h1:8y1KNILXrwpLE05HKvHMgQuhaCSfXSdhoLcXoaTpo4E=
178+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260925142839-bc557ac2d917/go.mod h1:jZioag+mpkEyn9C5N+ZYP5vX+wjzQyiwRSFKv1Swq9I=
179+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260923093806-be64bf3cea4d h1:le9pkYE30bsOgoRQricU3SMBIJeHfmeus38Vf7/QipU=
180+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260923093806-be64bf3cea4d/go.mod h1:bi+vZFQsvltD4KMjIqe43iPr+mAyaeQRRHdJBL0sLwU=
181181
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
182182
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
183183
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎bindata/crds/crds.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4798,14 +4798,15 @@ spec:
47984798
- local-ttl
47994799
- dhcp-ttl
48004800
- max-ttl
4801+
- log-queries
4802+
- log-debug
48014803
type: string
48024804
values:
48034805
items:
48044806
type: string
48054807
type: array
48064808
required:
48074809
- key
4808-
- values
48094810
type: object
48104811
type: array
48114812
override:
@@ -11922,6 +11923,13 @@ spec:
1192211923
default: 9932
1192311924
format: int32
1192411925
type: integer
11926+
logLevel:
11927+
default: debug
11928+
enum:
11929+
- none
11930+
- verbose
11931+
- debug
11932+
type: string
1192511933
maxConn:
1192611934
default: 8192
1192711935
format: int32

‎bindata/crds/memcached.openstack.org_memcacheds.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ spec:
5757
description: Name of the memcached container image to run (will be
5858
set to environmental default if empty)
5959
type: string
60+
logLevel:
61+
default: debug
62+
description: |-
63+
LogLevel controls memcached logging verbosity: "none" (quiet),
64+
"verbose" (-v), or "debug" (-vv).
65+
enum:
66+
- none
67+
- verbose
68+
- debug
69+
type: string
6070
maxConn:
6171
default: 8192
6272
description: Maximum number of connections accepted by Memcached

‎bindata/crds/network.openstack.org_dnsmasqs.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ spec:
8989
- local-ttl
9090
- dhcp-ttl
9191
- max-ttl
92+
- log-queries
93+
- log-debug
9294
type: string
9395
values:
9496
items:
9597
type: string
9698
type: array
9799
required:
98100
- key
99-
- values
100101
type: object
101102
type: array
102103
override:

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4264,14 +4264,15 @@ spec:
42644264
- local-ttl
42654265
- dhcp-ttl
42664266
- max-ttl
4267+
- log-queries
4268+
- log-debug
42674269
type: string
42684270
values:
42694271
items:
42704272
type: string
42714273
type: array
42724274
required:
42734275
- key
4274-
- values
42754276
type: object
42764277
type: array
42774278
override:
@@ -11388,6 +11389,13 @@ spec:
1138811389
default: 9932
1138911390
format: int32
1139011391
type: integer
11392+
logLevel:
11393+
default: debug
11394+
enum:
11395+
- none
11396+
- verbose
11397+
- debug
11398+
type: string
1139111399
maxConn:
1139211400
default: 8192
1139311401
format: int32

0 commit comments

Comments
 (0)