Skip to content

Commit 75b0741

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1496 from openstack-k8s-operators/openstack-dependency-bump/main
openstack-k8s-operators dependency bump branch: main
2 parents 2d9ec8b + 60a49cd commit 75b0741

13 files changed

+235
-76
lines changed

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16668,6 +16668,13 @@ spec:
1666816668
additionalProperties:
1666916669
type: string
1667016670
type: object
16671+
ringConfigMaps:
16672+
default:
16673+
- swift-ring-files
16674+
items:
16675+
type: string
16676+
type: array
16677+
x-kubernetes-list-type: atomic
1667116678
storageClass:
1667216679
default: ""
1667316680
type: string
@@ -16762,6 +16769,13 @@ spec:
1676216769
format: int32
1676316770
minimum: 0
1676416771
type: integer
16772+
ringConfigMaps:
16773+
default:
16774+
- swift-ring-files
16775+
items:
16776+
type: string
16777+
type: array
16778+
x-kubernetes-list-type: atomic
1676516779
secret:
1676616780
default: osp-secret
1676716781
type: string
@@ -16802,6 +16816,9 @@ spec:
1680216816
type: object
1680316817
swiftRing:
1680416818
properties:
16819+
enabled:
16820+
default: true
16821+
type: boolean
1680516822
minPartHours:
1680616823
default: 1
1680716824
format: int64
@@ -16816,6 +16833,13 @@ spec:
1681616833
format: int64
1681716834
minimum: 1
1681816835
type: integer
16836+
ringConfigMaps:
16837+
default:
16838+
- swift-ring-files
16839+
items:
16840+
type: string
16841+
type: array
16842+
x-kubernetes-list-type: atomic
1681916843
ringReplicas:
1682016844
default: 1
1682116845
format: int64
@@ -16856,6 +16880,13 @@ spec:
1685616880
format: int32
1685716881
minimum: 0
1685816882
type: integer
16883+
ringConfigMaps:
16884+
default:
16885+
- swift-ring-files
16886+
items:
16887+
type: string
16888+
type: array
16889+
x-kubernetes-list-type: atomic
1685916890
storageClass:
1686016891
default: ""
1686116892
type: string

‎apis/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ require (
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250605093226-67d5f3147fef
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250618202439-7931a9dd2cac
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250620072247-afc915d918b7
13-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250620063310-99f5c5b704ec
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250621121902-ff5932b36c37
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250620072533-3382b910c69e
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250620072009-47fe36aa7f8f
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250618132842-b6570a4d893d
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250620085455-c6585c9d26f3
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250620072008-0d8d8c482919
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250605082218-a58074898dd7
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250605082218-a58074898dd7
21-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250618201337-6ba90e30f23b
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250623132257-5a335b406522
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250620084047-a09f8928e572
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250620093059-21c3d7b794a9
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250618104220-144e0f93ea91
24+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250623103621-1c5567b12b75
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250620083745-d585666d1160
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250605085643-08087ea7ec0e
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250620103511-d871036416d1
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623105536-d840e4dc55cf
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134040-5b6ea945636b
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250604162335-2ecd086a2077
29-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250618210940-eecb9ac21612
29+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250622201001-ff21b777a402
3030
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250620145921-3ba8662956ad
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v0.3.1 // indirect

‎apis/go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250618202439-7
100100
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250618202439-7931a9dd2cac/go.mod h1:UjAj45onUQ4Dqhp2BUN+x5PQQMZIpYFxJyqlofO0Qbo=
101101
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250620072247-afc915d918b7 h1:GjA1hpGGLK6pF0+ekm61vpZjt+i80cMeHcrzaJSxR08=
102102
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250620072247-afc915d918b7/go.mod h1:7ZBMYsL9k0ennWcYNAz+mPHejIIlQEnd74n5H8TRPhg=
103-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250620063310-99f5c5b704ec h1:VijaNkietZsW7HJSWqx0nNsQjRcbdUpy3uFUXu3q25A=
104-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250620063310-99f5c5b704ec/go.mod h1:aSRzIwEwSMgpHgXaA7bCxgxteY8H9c5F8zfvlH36Bs0=
103+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250621121902-ff5932b36c37 h1:55eka7ZvPHPW6Nk6ay5IviMZUoaWwn5d0IVX7PtY+20=
104+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250621121902-ff5932b36c37/go.mod h1:DbwbZiNqh9MkGvUj47dPbXojq8QiBUPI3Tgbfj5Ynxw=
105105
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250620072533-3382b910c69e h1:TBMVmXfAvcQWRtsYciycNiHVrX2EEuNu+j+7svjRsIY=
106106
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250620072533-3382b910c69e/go.mod h1:vMExlZbEsUE9+OnnjG5Q9BRHZUyDn/DLI6jXEZ/sR+c=
107107
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250620072009-47fe36aa7f8f h1:+Q5mlFtTXMPu/uaKJ+cQTibnOsiwZ0Hlt3Q6oOroWIg=
@@ -118,26 +118,26 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.2025050
118118
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250508141203-be026d3164f7/go.mod h1:fesgTbs2j30Fhw2hebXkPgbeAIqG0Yk2oaeOklAInZg=
119119
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250605082218-a58074898dd7 h1:HvSxF3vi/iKqyI4tQZHtIsCHziXzntPiRsDj7XNMRgY=
120120
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250605082218-a58074898dd7/go.mod h1:U3LQ4Nz2+syTPfW66bSLv6OzefLpsqxWLdX9AFotRPA=
121-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250618201337-6ba90e30f23b h1:KCHbJR+WnVvXQeLnR26qvs9Poya7XGjUqkZ/uH0YDH8=
122-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250618201337-6ba90e30f23b/go.mod h1:Y4g8MXVW43qCZ3fV3/RaxOj2YMXwK1waFmusxyF9xQ0=
121+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250623132257-5a335b406522 h1:qTXy4TvQAteWZnV4cyf6MgpszTZr2HPDnED4ZwpiIqM=
122+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250623132257-5a335b406522/go.mod h1:FGjtyCqh/F/VFhAi7uQoXT0ngXz7T12dFBNjv3Zy6WI=
123123
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250620084047-a09f8928e572 h1:xkixBN6hFheWSNWT3yWSjU9OQVobXude/jHCimuAjvw=
124124
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250620084047-a09f8928e572/go.mod h1:FsXTlVNGH6gPBpsAJLJbO+jt1SS/gaMS0UJg5HbHOMM=
125125
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250620093059-21c3d7b794a9 h1:sxiCVDjIk1FWY8OEEfIlrn7TF/+v2CanMjMApA3ZIyk=
126126
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250620093059-21c3d7b794a9/go.mod h1:g2/9fEIdCvX/FcL6ntW1yvTTy9k3OsfVqFp2YlOBw8U=
127-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250618104220-144e0f93ea91 h1:xT88svMQCFZYWdvRsmqdim28sQPWAVTNvFVc3jlszyc=
128-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250618104220-144e0f93ea91/go.mod h1:eksCN/gyEqAvGCl89yXIpoc6i67MP4DzpoluzpLnDRs=
127+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250623103621-1c5567b12b75 h1:dxrbdjr4C2vAQz/13Zu7F0Yp95l49ig/6h5pVxtVShw=
128+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250623103621-1c5567b12b75/go.mod h1:eksCN/gyEqAvGCl89yXIpoc6i67MP4DzpoluzpLnDRs=
129129
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250620083745-d585666d1160 h1:2lesWZeyqKipZa+5qYAYb/PhYkGWGlCNv2yH6Hnb2Qw=
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250620083745-d585666d1160/go.mod h1:bwo701L2fifrRvlPeRAW2C/YpPNx4YXrzS/VnQEa8/Y=
131-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250605085643-08087ea7ec0e h1:T+iJ1Wd8xaLj6xK/fDm5Sfp9KZO5ndnuBiSL1Tna4xQ=
132-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250605085643-08087ea7ec0e/go.mod h1:8GYwXdEQEQ5Rlpp/qkcbKFNy8FArjWoCgezTnWz0i1g=
133-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250620103511-d871036416d1 h1:O6FijZ/NrnKv1fsndRqZ0Pci4TBUTirgrcFpSMG/jyo=
134-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250620103511-d871036416d1/go.mod h1:JqZcmN8j2PGB/817BKUQue1vBr4DTMkTQYqHj9RGNRg=
131+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623105536-d840e4dc55cf h1:D/XOAgmycmCLFTG1kPQJ+2HrQfIbS19jLqi/nxpd+0k=
132+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623105536-d840e4dc55cf/go.mod h1:IC6WKXLQF6W7sNwFCLBKK/rmPYufb6aLlbJk7UGuAfs=
133+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134040-5b6ea945636b h1:LhuAWVGhhURzmQ8ZOE1UbTvfVMUuzRQAl6R01E0wvSo=
134+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134040-5b6ea945636b/go.mod h1:kel7hOmC3VLCriVhuJHnMl0rXYrH+oMUaAUKGgXbNec=
135135
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250604162335-2ecd086a2077 h1:NnuLQa+wzCSaYh/SaDm1rbqpc8EQ440oc7aBv77FAGg=
136136
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250604162335-2ecd086a2077/go.mod h1:ZHZ/55O5Wpc1HMCC+pmTOrhFG+t8Ybuw2z0lqrCXg20=
137137
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 h1:/7SnnHfGCH/dwuZFNUx54zw4cnwv2w6hjONq16aoowM=
138138
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
139-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250618210940-eecb9ac21612 h1:S1XI5G6JNub2TUfcdcQTAHKpVqbcEqqyG56NyFXpxdk=
140-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250618210940-eecb9ac21612/go.mod h1:2hEPthpD4X1wyroHBC5FKg6keIG7qqZfLhL1coNM+EQ=
139+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250622201001-ff21b777a402 h1:3SZ3v5R383ndn+6mCSKrZSaAxuPLjM6f7ICsAwGXxZ0=
140+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250622201001-ff21b777a402/go.mod h1:2hEPthpD4X1wyroHBC5FKg6keIG7qqZfLhL1coNM+EQ=
141141
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250620145921-3ba8662956ad h1:quAqF6ii8LdmDKtYp2N6A4wfWr72cXL1cIAomr8AJQ4=
142142
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250620145921-3ba8662956ad/go.mod h1:0jfQR21/yBCXVFMqnxEnsdtraV4I49cAr6qwe8wIe6E=
143143
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎bindata/crds/crds.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16832,6 +16832,13 @@ spec:
1683216832
additionalProperties:
1683316833
type: string
1683416834
type: object
16835+
ringConfigMaps:
16836+
default:
16837+
- swift-ring-files
16838+
items:
16839+
type: string
16840+
type: array
16841+
x-kubernetes-list-type: atomic
1683516842
storageClass:
1683616843
default: ""
1683716844
type: string
@@ -16926,6 +16933,13 @@ spec:
1692616933
format: int32
1692716934
minimum: 0
1692816935
type: integer
16936+
ringConfigMaps:
16937+
default:
16938+
- swift-ring-files
16939+
items:
16940+
type: string
16941+
type: array
16942+
x-kubernetes-list-type: atomic
1692916943
secret:
1693016944
default: osp-secret
1693116945
type: string
@@ -16966,6 +16980,9 @@ spec:
1696616980
type: object
1696716981
swiftRing:
1696816982
properties:
16983+
enabled:
16984+
default: true
16985+
type: boolean
1696916986
minPartHours:
1697016987
default: 1
1697116988
format: int64
@@ -16980,6 +16997,13 @@ spec:
1698016997
format: int64
1698116998
minimum: 1
1698216999
type: integer
17000+
ringConfigMaps:
17001+
default:
17002+
- swift-ring-files
17003+
items:
17004+
type: string
17005+
type: array
17006+
x-kubernetes-list-type: atomic
1698317007
ringReplicas:
1698417008
default: 1
1698517009
format: int64
@@ -17020,6 +17044,13 @@ spec:
1702017044
format: int32
1702117045
minimum: 0
1702217046
type: integer
17047+
ringConfigMaps:
17048+
default:
17049+
- swift-ring-files
17050+
items:
17051+
type: string
17052+
type: array
17053+
x-kubernetes-list-type: atomic
1702317054
storageClass:
1702417055
default: ""
1702517056
type: string

‎bindata/crds/swift.openstack.org_swiftproxies.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,14 @@ spec:
269269
format: int32
270270
minimum: 0
271271
type: integer
272+
ringConfigMaps:
273+
default:
274+
- swift-ring-files
275+
description: List of ring ConfigMaps
276+
items:
277+
type: string
278+
type: array
279+
x-kubernetes-list-type: atomic
272280
secret:
273281
default: osp-secret
274282
description: Secret containing OpenStack password information for

‎bindata/crds/swift.openstack.org_swiftrings.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ spec:
5151
containerImage:
5252
description: Image URL for Swift proxy service
5353
type: string
54+
enabled:
55+
default: true
56+
description: Enabled - Whether SwiftRing service should be deployed
57+
and managed
58+
type: boolean
5459
minPartHours:
5560
default: 1
5661
description: Minimum number of hours to restrict moving a partition
@@ -70,6 +75,14 @@ spec:
7075
format: int64
7176
minimum: 1
7277
type: integer
78+
ringConfigMaps:
79+
default:
80+
- swift-ring-files
81+
description: List of ring ConfigMaps
82+
items:
83+
type: string
84+
type: array
85+
x-kubernetes-list-type: atomic
7386
ringReplicas:
7487
default: 1
7588
description: Number of Swift data replicas (=copies)

‎bindata/crds/swift.openstack.org_swifts.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ spec:
6868
description: NodeSelector to target subset of worker nodes running
6969
this service
7070
type: object
71+
ringConfigMaps:
72+
default:
73+
- swift-ring-files
74+
description: List of ring ConfigMaps
75+
items:
76+
type: string
77+
type: array
78+
x-kubernetes-list-type: atomic
7179
storageClass:
7280
default: ""
7381
description: |-
@@ -295,6 +303,14 @@ spec:
295303
format: int32
296304
minimum: 0
297305
type: integer
306+
ringConfigMaps:
307+
default:
308+
- swift-ring-files
309+
description: List of ring ConfigMaps
310+
items:
311+
type: string
312+
type: array
313+
x-kubernetes-list-type: atomic
298314
secret:
299315
default: osp-secret
300316
description: Secret containing OpenStack password information
@@ -368,6 +384,11 @@ spec:
368384
containerImage:
369385
description: Image URL for Swift proxy service
370386
type: string
387+
enabled:
388+
default: true
389+
description: Enabled - Whether SwiftRing service should be deployed
390+
and managed
391+
type: boolean
371392
minPartHours:
372393
default: 1
373394
description: Minimum number of hours to restrict moving a partition
@@ -387,6 +408,14 @@ spec:
387408
format: int64
388409
minimum: 1
389410
type: integer
411+
ringConfigMaps:
412+
default:
413+
- swift-ring-files
414+
description: List of ring ConfigMaps
415+
items:
416+
type: string
417+
type: array
418+
x-kubernetes-list-type: atomic
390419
ringReplicas:
391420
default: 1
392421
description: Number of Swift data replicas (=copies)
@@ -455,6 +484,14 @@ spec:
455484
format: int32
456485
minimum: 0
457486
type: integer
487+
ringConfigMaps:
488+
default:
489+
- swift-ring-files
490+
description: List of ring ConfigMaps
491+
items:
492+
type: string
493+
type: array
494+
x-kubernetes-list-type: atomic
458495
storageClass:
459496
default: ""
460497
description: Name of StorageClass to use for Swift PVs

‎bindata/crds/swift.openstack.org_swiftstorages.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ spec:
9696
format: int32
9797
minimum: 0
9898
type: integer
99+
ringConfigMaps:
100+
default:
101+
- swift-ring-files
102+
description: List of ring ConfigMaps
103+
items:
104+
type: string
105+
type: array
106+
x-kubernetes-list-type: atomic
99107
storageClass:
100108
default: ""
101109
description: Name of StorageClass to use for Swift PVs

0 commit comments

Comments
 (0)