Skip to content

Commit af4e63e

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2190 from openstack-k8s-operators/openstack-dependency-bump/18-stable
openstack-k8s-operators dependency bump branch: 18-stable
2 parents 69549d8 + 1241b1a commit af4e63e

14 files changed

Lines changed: 195 additions & 73 deletions

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,9 @@ spec:
567567
enum:
568568
- simple_crypto
569569
- pkcs11
570+
- kmip
570571
type: string
571-
maxItems: 2
572+
maxItems: 3
572573
minItems: 1
573574
type: array
574575
x-kubernetes-list-type: set
@@ -1086,7 +1087,15 @@ spec:
10861087
enum:
10871088
- simple_crypto
10881089
- pkcs11
1090+
- kmip
10891091
type: string
1092+
kmip:
1093+
properties:
1094+
clientDataPath:
1095+
type: string
1096+
clientDataSecret:
1097+
type: string
1098+
type: object
10901099
messagingBus:
10911100
properties:
10921101
cluster:
@@ -1138,14 +1147,12 @@ spec:
11381147
pkcs11:
11391148
properties:
11401149
clientDataPath:
1141-
default: /etc/hsm-client
11421150
type: string
11431151
clientDataSecret:
11441152
type: string
11451153
loginSecret:
11461154
type: string
11471155
required:
1148-
- clientDataSecret
11491156
- loginSecret
11501157
type: object
11511158
preserveJobs:

‎api/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/go-playground/validator/v10 v10.30.3
88
github.com/onsi/ginkgo/v2 v2.33.1
99
github.com/onsi/gomega v1.44.0
10-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261017100150-073cb436de91
10+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261022153932-513441c9633e
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261017191403-63582d9b7266
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261019070055-e17353692d81
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261017100533-2c5b28c19d6d
@@ -18,16 +18,16 @@ require (
1818
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.20261019065710-51a348318f22
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261022151824-97f4d51b23c3
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261017100534-d6c81d8ef44b
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261017100911-624d61fabd3c
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261019085556-42ce1210eaed
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261019082115-fba1dc001ea3
2626
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
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261021053104-9ba69307558b
2828
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
30-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261015063838-d1176e9f1685
29+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261021195003-62e5f830cfe6
30+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261021084220-96c3630fa4c1
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/onsi/gomega v1.44.0 h1:eAiGl3Pw5jz5GQdDff0BcxYpAX1JxW8xD7mFUuwNfZQ=
134134
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=
137-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261017100150-073cb436de91 h1:SgefPq11pbvDZiZOPu7mU2fg9iu2BgAv1spzXZZHbgM=
138-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261017100150-073cb436de91/go.mod h1:PwelFZRhRo8dDxkMFCKQ3BdrmXmlmsUTpmH4D7xAvjE=
137+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261022153932-513441c9633e h1:YliOXlsFXWjLfwDA69a1mnG85yydO9jRxkHVjaSx5lc=
138+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261022153932-513441c9633e/go.mod h1:sL1D7540NDGeY49ERP0vxt4UHeEdZch3nr8mTOZu3JA=
139139
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261017191403-63582d9b7266 h1:1/D7QTzkxh+xJxyHcshwCMCTfoeUlrjT1C7wWBAH/ro=
140140
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261017191403-63582d9b7266/go.mod h1:kzvRKWwr/wbNNmOAaMBT0KLVX9umgmU5RZWUnTjr4Vk=
141141
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261019070055-e17353692d81 h1:SZmt9ymYhjt1xot7cdfIeQIZ6XZaX2WlsiICMBaFJgM=
@@ -158,8 +158,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.2026101
158158
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.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=
161+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261022151824-97f4d51b23c3 h1:MtpeirLpxplkYD6RNmDmmtdDYoMXmZkptzokqVpryYo=
162+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20261022151824-97f4d51b23c3/go.mod h1:pvabclKr+csGi0h84GioDLyR6kxa7mwDoX7N5DowzGg=
163163
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261017100534-d6c81d8ef44b h1:XByX5k/x0PtxaNLajZG6VgVGvGCee8XPbS2+4bwmHYk=
164164
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261017100534-d6c81d8ef44b/go.mod h1:wuFPy7s5QoLqtbZd2MM2jf8LPfDiYYw79twGhCan6dk=
165165
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261017100911-624d61fabd3c h1:IxZACMoOhkO3ygMNcjeIo3knurRnbU7GvcmC1gGS7Rk=
@@ -170,14 +170,14 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261019082115-
170170
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261019082115-fba1dc001ea3/go.mod h1:L5bRicuXV6bnyqh65RSl93R7sNI9is7OwRmhRWMYPbA=
171171
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261019070056-203b046f2ef8 h1:IZwGQLaT2ht2NBSCiZ2xFAaDpOR+NGp0XOLOa9GXTKM=
172172
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=
173+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261021053104-9ba69307558b h1:FXxYslNNQe8CcLu6/wobZgTvw8rDC4q2EU09AoNu6qA=
174+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261021053104-9ba69307558b/go.mod h1:e5DpunH0uPKb2y9zMIO2QSSH7GF2SLCiFoet1jeFy8c=
175175
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261017101559-184f0c3ff6d1 h1:oLAZ4JLB5AqCqL5Rg5ezs/JSiTUCjXuftF93vn+M18Q=
176176
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=
179-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261015063838-d1176e9f1685 h1:zvPGHT9gXenPAyAjvzrsDmS0FjFt9CQD3W0MLvPaOyY=
180-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261015063838-d1176e9f1685/go.mod h1:PokaVHHa3qlfNmoOUq82SQgVlOBDtdZv42nQuJELPe4=
177+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261021195003-62e5f830cfe6 h1:+Aqy8MvdGBNoDPqLtpRN8+0s/01MoUcv2NywCRdVfoY=
178+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261021195003-62e5f830cfe6/go.mod h1:0UCLRTtKHsolnPt2L3TKyJuyt0AtR5DVUixpVR4wYBs=
179+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261021084220-96c3630fa4c1 h1:38Cx+PCbkpGO0iyoWfHoc+QBUA2xkCAGQQDcLsWthtY=
180+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261021084220-96c3630fa4c1/go.mod h1:r7dFbFHLcy0AkATOOLmgpeR+w75aT18WC1aOeR/ohDs=
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/barbican.openstack.org_barbicanapis.yaml‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ spec:
103103
enum:
104104
- simple_crypto
105105
- pkcs11
106+
- kmip
106107
type: string
107-
maxItems: 2
108+
maxItems: 3
108109
minItems: 1
109110
type: array
110111
x-kubernetes-list-type: set
@@ -1237,7 +1238,27 @@ spec:
12371238
enum:
12381239
- simple_crypto
12391240
- pkcs11
1241+
- kmip
12401242
type: string
1243+
kmip:
1244+
description: BarbicanKMIPTemplate - Includes the KMIP secret store
1245+
properties
1246+
properties:
1247+
clientDataPath:
1248+
description: |-
1249+
Location to which kolla copies ClientDataSecret, i.e. where the backend
1250+
client library expects to find it. Defaulted per secret store by the
1251+
Barbican webhook (DefaultPKCS11ClientDataPath, DefaultKMIPClientDataPath).
1252+
type: string
1253+
clientDataSecret:
1254+
description: |-
1255+
The OpenShift secret that stores the backend client data.
1256+
These will be copied by kolla to ClientDataPath.
1257+
Required when the owning secret store is enabled; this is enforced by
1258+
the Barbican webhook rather than by the schema, because the schema
1259+
cannot make it conditional on EnabledSecretStores.
1260+
type: string
1261+
type: object
12411262
messagingBus:
12421263
description: MessagingBus configuration (username, vhost, and cluster)
12431264
properties:
@@ -1478,20 +1499,24 @@ spec:
14781499
description: BarbicanPKCS11Template - Includes common HSM properties
14791500
properties:
14801501
clientDataPath:
1481-
default: /etc/hsm-client
1482-
description: Location to which kolla will copy the data in ClientDataSecret.
1502+
description: |-
1503+
Location to which kolla copies ClientDataSecret, i.e. where the backend
1504+
client library expects to find it. Defaulted per secret store by the
1505+
Barbican webhook (DefaultPKCS11ClientDataPath, DefaultKMIPClientDataPath).
14831506
type: string
14841507
clientDataSecret:
14851508
description: |-
1486-
The OpenShift secret that stores the HSM client data.
1487-
These will be mounted to /var/lib/config-data/hsm
1509+
The OpenShift secret that stores the backend client data.
1510+
These will be copied by kolla to ClientDataPath.
1511+
Required when the owning secret store is enabled; this is enforced by
1512+
the Barbican webhook rather than by the schema, because the schema
1513+
cannot make it conditional on EnabledSecretStores.
14881514
type: string
14891515
loginSecret:
14901516
description: OpenShift secret that stores the password to login
14911517
to the PKCS11 session
14921518
type: string
14931519
required:
1494-
- clientDataSecret
14951520
- loginSecret
14961521
type: object
14971522
rabbitMqClusterName:

‎bindata/crds/barbican.openstack.org_barbicankeystonelisteners.yaml‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ spec:
9595
enum:
9696
- simple_crypto
9797
- pkcs11
98+
- kmip
9899
type: string
99-
maxItems: 2
100+
maxItems: 3
100101
minItems: 1
101102
type: array
102103
x-kubernetes-list-type: set
@@ -1229,7 +1230,27 @@ spec:
12291230
enum:
12301231
- simple_crypto
12311232
- pkcs11
1233+
- kmip
12321234
type: string
1235+
kmip:
1236+
description: BarbicanKMIPTemplate - Includes the KMIP secret store
1237+
properties
1238+
properties:
1239+
clientDataPath:
1240+
description: |-
1241+
Location to which kolla copies ClientDataSecret, i.e. where the backend
1242+
client library expects to find it. Defaulted per secret store by the
1243+
Barbican webhook (DefaultPKCS11ClientDataPath, DefaultKMIPClientDataPath).
1244+
type: string
1245+
clientDataSecret:
1246+
description: |-
1247+
The OpenShift secret that stores the backend client data.
1248+
These will be copied by kolla to ClientDataPath.
1249+
Required when the owning secret store is enabled; this is enforced by
1250+
the Barbican webhook rather than by the schema, because the schema
1251+
cannot make it conditional on EnabledSecretStores.
1252+
type: string
1253+
type: object
12331254
messagingBus:
12341255
description: MessagingBus configuration (username, vhost, and cluster)
12351256
properties:
@@ -1311,20 +1332,24 @@ spec:
13111332
description: BarbicanPKCS11Template - Includes common HSM properties
13121333
properties:
13131334
clientDataPath:
1314-
default: /etc/hsm-client
1315-
description: Location to which kolla will copy the data in ClientDataSecret.
1335+
description: |-
1336+
Location to which kolla copies ClientDataSecret, i.e. where the backend
1337+
client library expects to find it. Defaulted per secret store by the
1338+
Barbican webhook (DefaultPKCS11ClientDataPath, DefaultKMIPClientDataPath).
13161339
type: string
13171340
clientDataSecret:
13181341
description: |-
1319-
The OpenShift secret that stores the HSM client data.
1320-
These will be mounted to /var/lib/config-data/hsm
1342+
The OpenShift secret that stores the backend client data.
1343+
These will be copied by kolla to ClientDataPath.
1344+
Required when the owning secret store is enabled; this is enforced by
1345+
the Barbican webhook rather than by the schema, because the schema
1346+
cannot make it conditional on EnabledSecretStores.
13211347
type: string
13221348
loginSecret:
13231349
description: OpenShift secret that stores the password to login
13241350
to the PKCS11 session
13251351
type: string
13261352
required:
1327-
- clientDataSecret
13281353
- loginSecret
13291354
type: object
13301355
rabbitMqClusterName:

‎bindata/crds/barbican.openstack.org_barbicans.yaml‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,9 @@ spec:
684684
enum:
685685
- simple_crypto
686686
- pkcs11
687+
- kmip
687688
type: string
688-
maxItems: 2
689+
maxItems: 3
689690
minItems: 1
690691
type: array
691692
x-kubernetes-list-type: set
@@ -1818,7 +1819,27 @@ spec:
18181819
enum:
18191820
- simple_crypto
18201821
- pkcs11
1822+
- kmip
18211823
type: string
1824+
kmip:
1825+
description: BarbicanKMIPTemplate - Includes the KMIP secret store
1826+
properties
1827+
properties:
1828+
clientDataPath:
1829+
description: |-
1830+
Location to which kolla copies ClientDataSecret, i.e. where the backend
1831+
client library expects to find it. Defaulted per secret store by the
1832+
Barbican webhook (DefaultPKCS11ClientDataPath, DefaultKMIPClientDataPath).
1833+
type: string
1834+
clientDataSecret:
1835+
description: |-
1836+
The OpenShift secret that stores the backend client data.
1837+
These will be copied by kolla to ClientDataPath.
1838+
Required when the owning secret store is enabled; this is enforced by
1839+
the Barbican webhook rather than by the schema, because the schema
1840+
cannot make it conditional on EnabledSecretStores.
1841+
type: string
1842+
type: object
18221843
messagingBus:
18231844
description: MessagingBus configuration (username, vhost, and cluster)
18241845
properties:
@@ -1890,20 +1911,24 @@ spec:
18901911
description: BarbicanPKCS11Template - Includes common HSM properties
18911912
properties:
18921913
clientDataPath:
1893-
default: /etc/hsm-client
1894-
description: Location to which kolla will copy the data in ClientDataSecret.
1914+
description: |-
1915+
Location to which kolla copies ClientDataSecret, i.e. where the backend
1916+
client library expects to find it. Defaulted per secret store by the
1917+
Barbican webhook (DefaultPKCS11ClientDataPath, DefaultKMIPClientDataPath).
18951918
type: string
18961919
clientDataSecret:
18971920
description: |-
1898-
The OpenShift secret that stores the HSM client data.
1899-
These will be mounted to /var/lib/config-data/hsm
1921+
The OpenShift secret that stores the backend client data.
1922+
These will be copied by kolla to ClientDataPath.
1923+
Required when the owning secret store is enabled; this is enforced by
1924+
the Barbican webhook rather than by the schema, because the schema
1925+
cannot make it conditional on EnabledSecretStores.
19001926
type: string
19011927
loginSecret:
19021928
description: OpenShift secret that stores the password to login
19031929
to the PKCS11 session
19041930
type: string
19051931
required:
1906-
- clientDataSecret
19071932
- loginSecret
19081933
type: object
19091934
preserveJobs:

0 commit comments

Comments
 (0)