Skip to content

Commit 1a997c3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1420 from openstack-k8s-operators/openstack-dependency-bump/18.0-fr2
openstack-k8s-operators dependency bump branch: 18.0-fr2
2 parents ddc7dd1 + 54642e5 commit 1a997c3

14 files changed

Lines changed: 163 additions & 45 deletions

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9921,6 +9921,9 @@ spec:
99219921
serviceUser:
99229922
default: octavia
99239923
type: string
9924+
tenantDomainName:
9925+
default: Default
9926+
type: string
99249927
tenantName:
99259928
default: service
99269929
type: string
@@ -10079,6 +10082,9 @@ spec:
1007910082
serviceUser:
1008010083
default: octavia
1008110084
type: string
10085+
tenantDomainName:
10086+
default: Default
10087+
type: string
1008210088
tenantName:
1008310089
default: service
1008410090
type: string
@@ -10220,6 +10226,9 @@ spec:
1022010226
serviceUser:
1022110227
default: octavia
1022210228
type: string
10229+
tenantDomainName:
10230+
default: Default
10231+
type: string
1022310232
tenantName:
1022410233
default: service
1022510234
type: string
@@ -10465,6 +10474,9 @@ spec:
1046510474
serviceUser:
1046610475
default: octavia
1046710476
type: string
10477+
tenantDomainName:
10478+
default: Default
10479+
type: string
1046810480
tenantName:
1046910481
default: service
1047010482
type: string
@@ -10550,6 +10562,9 @@ spec:
1055010562
sshPubkey:
1055110563
default: octavia-ssh-pubkey
1055210564
type: string
10565+
tenantDomainName:
10566+
default: Default
10567+
type: string
1055310568
tenantName:
1055410569
default: service
1055510570
type: string
@@ -15321,6 +15336,12 @@ spec:
1532115336
storageClassName:
1532215337
type: string
1532315338
type: object
15339+
queueType:
15340+
default: Mirrored
15341+
enum:
15342+
- None
15343+
- Mirrored
15344+
type: string
1532415345
rabbitmq:
1532515346
properties:
1532615347
additionalConfig:

‎apis/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ require (
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20250309111939-993ca865f0c6
1212
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20250415084551-d08f8217b145
1313
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20250313095848-696e130a211c
14-
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250415082332-c8024af2e681
14+
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250422121335-2795f5791735
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250414174640-42a6a9fa2974
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250415080700-795c57b1aecf
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250429160209-87eedb8446d8
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250415085116-a3a67a9ae148
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250415084259-fc5641fe6cd0
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250414142358-93cd2db6b160
20-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250414142358-93cd2db6b160
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250429142319-453fcb22aa51
20+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51
2121
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250309112508-cf00b761df6c
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250305145615-aaf8a6217170
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250415081231-9c7b40604a87
2424
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250306093207-a3eebb51a077
25-
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250415085116-d275e9c4d2a3
25+
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250422185630-f45575b1d424
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250415082332-6583066a8073
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250324102150-0e88ed086da1
2828
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250415081802-b5f8c7b86b7c

‎apis/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,22 +102,22 @@ github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.2025041508455
102102
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20250415084551-d08f8217b145/go.mod h1:PmoNmbsbb/f/dZ55/N2t6LJFu9x8fbDIrIpmmYYq87E=
103103
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20250313095848-696e130a211c h1:Q5yKfxBG57I1Assd1sja/2y/e/Y9aLP8VyGfqWpyfm8=
104104
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20250313095848-696e130a211c/go.mod h1:sO+o7vxXKAjHijpLNgCvTOgXhvnIx3ehw6mvDvT810g=
105-
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250415082332-c8024af2e681 h1:43mzSBpJKXl30Z+LEiUNpLraEfOZHM8FbcwQlUI5MWM=
106-
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250415082332-c8024af2e681/go.mod h1:zpmUOoLWshUxW+TZPccO05mdM0MeLZBfg4YrkD/pm24=
105+
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250422121335-2795f5791735 h1:+EcNdzwloHKf0f3iFSEh030Fk3jpEJVPdGvxNGSusKI=
106+
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250422121335-2795f5791735/go.mod h1:zpmUOoLWshUxW+TZPccO05mdM0MeLZBfg4YrkD/pm24=
107107
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250414174640-42a6a9fa2974 h1:dh4pFqrArV2jrlhQ/9Cp9JSe/BgAf96DYdG97UocIAU=
108108
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250414174640-42a6a9fa2974/go.mod h1:9VxphblkjWIwhR8w7EUnpzwPpKpf+7WXzsRNSfFVR6g=
109-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250415080700-795c57b1aecf h1:BdQisCFYXRQmPp6RE16WSCdRscos2LxVQfR471qLyNY=
110-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250415080700-795c57b1aecf/go.mod h1:WxLsDNVQ/HzoqbHTcnPHt6pwTlqyNfAEq1duaA2PXpw=
109+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250429160209-87eedb8446d8 h1:zaFWbCZcMzzyUYqqG5aUA6Qrulm+p4VZ4XpF2j/9Z4M=
110+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250429160209-87eedb8446d8/go.mod h1:IAk2+sedWN9NsjbMn/KB0ne8pZ3Jxs/uE90qxP4J2Nk=
111111
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250415085116-a3a67a9ae148 h1:I0svMUrh5kYFzvL0zP19R/QHGBLo1h+oK7Ipeyv8kSo=
112112
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250415085116-a3a67a9ae148/go.mod h1:g2jCFaqY+LydpoG3h+92eo+GU3B3folUN7aCeSXuZlI=
113113
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250415084259-fc5641fe6cd0 h1:w4mE3IAcOSFo9PTc5srewkgPcrIlezxvei+nqgybomw=
114114
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250415084259-fc5641fe6cd0/go.mod h1:KljyuWj6HzZJF1x5f0rnYoITqcmYryM93Trdv9PNd1I=
115-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250414142358-93cd2db6b160 h1:7l70xtCoyyz6kjMTSBdL4+4yUhZBrAVWLLzB7w+yhD4=
116-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250414142358-93cd2db6b160/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
115+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250429142319-453fcb22aa51 h1:hxmpbIox9EJpnIgThvJSnkFL45Nt7LL1zbosOn045OY=
116+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250429142319-453fcb22aa51/go.mod h1:u0GetHYXjVmeVA2W2zH9TCQZJSssDoNVyeRwvmxicCs=
117117
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250228124213-cd63da392f97 h1:2m8xt9k3FWcnzmq5SxplT0t6v8vvH7LZq3UWK17ygak=
118118
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250228124213-cd63da392f97/go.mod h1:tfMa+ochq7Dyilq9hQr2CEPfPtsj6IUgMmMqi4CWDmo=
119-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250414142358-93cd2db6b160 h1:keFqEN+ADfHtD7PLFO+zZ1d5WwMUNrYdzPJ3TIS7Jx4=
120-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250414142358-93cd2db6b160/go.mod h1:u7Zqmyt1WB96KSz8apYltrZV9xlL0tTVYwOk9+6G57k=
119+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51 h1:JqZMUVRkMb84pgiQzG1DOBHuIFvtg0UMB3zsDEKrpUs=
120+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51/go.mod h1:5+v92XC/PRATIiBrhNLEpJ+T4R9JpxBCgRP6QvbfwgE=
121121
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250309112508-cf00b761df6c h1:SPceicFSxQMAWVcLRBnS6AJsa2QPaXWSB2dCmUnSrsI=
122122
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250309112508-cf00b761df6c/go.mod h1:nImY+iG25DBPoBLIwicS4KSVwcJedI84yloNquA5LU4=
123123
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250305145615-aaf8a6217170 h1:S8+jD12fZzgwakgIoEilQ8ACbtjt3wKW2QJ3uFODVM4=
@@ -126,8 +126,8 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250415081231-
126126
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250415081231-9c7b40604a87/go.mod h1:PNyPP+1w78dZMmnkXsqOZQB9NNpK7mk0wBjmm8qEq7w=
127127
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250306093207-a3eebb51a077 h1:izKfvLpUIXCGDg4EMaxc2Ww5sdCzPu76syXe7JTYHfw=
128128
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250306093207-a3eebb51a077/go.mod h1:92KQ1xUJQRS4oxCaZ8jkdUju7gypr/1HpOMPOQRmGo4=
129-
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250415085116-d275e9c4d2a3 h1:1cpVM/BiXAGywOA6LgXQd9D3reEEDrP9xsYZLlD8Pas=
130-
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250415085116-d275e9c4d2a3/go.mod h1:jUG80IJPsljwWzvRvjbrAtgVebKyrctBsY+5rh3tX8Q=
129+
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250422185630-f45575b1d424 h1:noOp3ApzmOp5GSFbK4w60hH2dGv55Vwc5cHztSZvFak=
130+
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250422185630-f45575b1d424/go.mod h1:jUG80IJPsljwWzvRvjbrAtgVebKyrctBsY+5rh3tX8Q=
131131
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250415082332-6583066a8073 h1:Y3LyHlvFOUyTbMWD3NVHrx0CeaOhsQstJqdkULiSgv8=
132132
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250415082332-6583066a8073/go.mod h1:7fuBgnG2eLyO7GGTt3mhMlGf96HT1XIBoTkVqHvSg0k=
133133
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250324102150-0e88ed086da1 h1:+6Qv8XT/u+stj7jtgcfETFrq28IaD+bQVyLsQClxwbU=

‎bindata/crds/crds.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10085,6 +10085,9 @@ spec:
1008510085
serviceUser:
1008610086
default: octavia
1008710087
type: string
10088+
tenantDomainName:
10089+
default: Default
10090+
type: string
1008810091
tenantName:
1008910092
default: service
1009010093
type: string
@@ -10243,6 +10246,9 @@ spec:
1024310246
serviceUser:
1024410247
default: octavia
1024510248
type: string
10249+
tenantDomainName:
10250+
default: Default
10251+
type: string
1024610252
tenantName:
1024710253
default: service
1024810254
type: string
@@ -10384,6 +10390,9 @@ spec:
1038410390
serviceUser:
1038510391
default: octavia
1038610392
type: string
10393+
tenantDomainName:
10394+
default: Default
10395+
type: string
1038710396
tenantName:
1038810397
default: service
1038910398
type: string
@@ -10629,6 +10638,9 @@ spec:
1062910638
serviceUser:
1063010639
default: octavia
1063110640
type: string
10641+
tenantDomainName:
10642+
default: Default
10643+
type: string
1063210644
tenantName:
1063310645
default: service
1063410646
type: string
@@ -10714,6 +10726,9 @@ spec:
1071410726
sshPubkey:
1071510727
default: octavia-ssh-pubkey
1071610728
type: string
10729+
tenantDomainName:
10730+
default: Default
10731+
type: string
1071710732
tenantName:
1071810733
default: service
1071910734
type: string
@@ -15485,6 +15500,12 @@ spec:
1548515500
storageClassName:
1548615501
type: string
1548715502
type: object
15503+
queueType:
15504+
default: Mirrored
15505+
enum:
15506+
- None
15507+
- Mirrored
15508+
type: string
1548815509
rabbitmq:
1548915510
properties:
1549015511
additionalConfig:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ spec:
242242
description: 'ServiceUser - service user name (TODO: beagles, do we
243243
need this at all)'
244244
type: string
245+
tenantDomainName:
246+
default: Default
247+
description: TenantDomainName - the name of the OpenStack domain associated
248+
with the tenant
249+
type: string
245250
tenantName:
246251
default: service
247252
description: TenantName - the name of the OpenStack tenant that controls

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,11 @@ spec:
365365
default: octavia
366366
description: ServiceUser - service user name
367367
type: string
368+
tenantDomainName:
369+
default: Default
370+
description: TenantDomainName - the name of the OpenStack domain associated
371+
with the tenant
372+
type: string
368373
tenantName:
369374
default: service
370375
description: TenantName - the name of the OpenStack tenant that controls

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,11 @@ spec:
472472
default: octavia
473473
description: ServiceUser - service user name
474474
type: string
475+
tenantDomainName:
476+
default: Default
477+
description: TenantDomainName - the name of the OpenStack domain
478+
associated with the tenant
479+
type: string
475480
tenantName:
476481
default: service
477482
description: TenantName - the name of the OpenStack tenant that
@@ -737,6 +742,11 @@ spec:
737742
description: 'ServiceUser - service user name (TODO: beagles,
738743
do we need this at all)'
739744
type: string
745+
tenantDomainName:
746+
default: Default
747+
description: TenantDomainName - the name of the OpenStack domain
748+
associated with the tenant
749+
type: string
740750
tenantName:
741751
default: service
742752
description: TenantName - the name of the OpenStack tenant that
@@ -971,6 +981,11 @@ spec:
971981
description: 'ServiceUser - service user name (TODO: beagles,
972982
do we need this at all)'
973983
type: string
984+
tenantDomainName:
985+
default: Default
986+
description: TenantDomainName - the name of the OpenStack domain
987+
associated with the tenant
988+
type: string
974989
tenantName:
975990
default: service
976991
description: TenantName - the name of the OpenStack tenant that
@@ -1378,6 +1393,11 @@ spec:
13781393
description: 'ServiceUser - service user name (TODO: beagles,
13791394
do we need this at all)'
13801395
type: string
1396+
tenantDomainName:
1397+
default: Default
1398+
description: TenantDomainName - the name of the OpenStack domain
1399+
associated with the tenant
1400+
type: string
13811401
tenantName:
13821402
default: service
13831403
description: TenantName - the name of the OpenStack tenant that
@@ -1531,6 +1551,11 @@ spec:
15311551
LoadBalancerSSHPubKey - The name of the ConfigMap containing the
15321552
pubilc key for connecting to the amphorae via SSH
15331553
type: string
1554+
tenantDomainName:
1555+
default: Default
1556+
description: TenantDomainName - the name of the OpenStack domain associated
1557+
with the tenant
1558+
type: string
15341559
tenantName:
15351560
default: service
15361561
description: TenantName - the name of the OpenStack tenant that controls

‎bindata/crds/rabbitmq.openstack.org_rabbitmqs.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9593,6 +9593,14 @@ spec:
95939593
from.
95949594
type: string
95959595
type: object
9596+
queueType:
9597+
default: Mirrored
9598+
description: QueueType to eventually apply the ha-all policy to the
9599+
cluster
9600+
enum:
9601+
- None
9602+
- Mirrored
9603+
type: string
95969604
rabbitmq:
95979605
description: Configuration options for RabbitMQ Pods created in the
95989606
cluster.
@@ -9982,6 +9990,10 @@ spec:
99829990
the opentack-operator in the top-level CR (e.g. the ContainerImage)
99839991
format: int64
99849992
type: integer
9993+
queueType:
9994+
description: QueueType - store whether default ha-all policy is present
9995+
or not
9996+
type: string
99859997
type: object
99869998
type: object
99879999
served: true

‎bindata/rbac/infra-operator-rbac.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,19 @@ rules:
122122
resources:
123123
- pods
124124
verbs:
125+
- create
126+
- delete
125127
- get
126128
- list
127129
- patch
128130
- update
129131
- watch
132+
- apiGroups:
133+
- ""
134+
resources:
135+
- pods/exec
136+
verbs:
137+
- create
130138
- apiGroups:
131139
- ""
132140
resources:

0 commit comments

Comments
 (0)