Skip to content

Commit 041f9aa

Browse files
author
OpenStack K8s CI
committed
Update openstack-k8s-operators
1 parent e523d7a commit 041f9aa

22 files changed

+1498
-771
lines changed

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 18 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,9 @@ spec:
458458
service: BarbicanPassword
459459
simplecryptokek: BarbicanSimpleCryptoKEK
460460
properties:
461+
pkcs11pin:
462+
default: PKCS11Pin
463+
type: string
461464
service:
462465
default: BarbicanPassword
463466
type: string
@@ -467,72 +470,16 @@ spec:
467470
type: object
468471
pkcs11:
469472
properties:
470-
AESGCMGenerateIV:
471-
default: true
472-
type: boolean
473-
HMACKeyType:
474-
default: CKK_GENERIC_SECRET
475-
type: string
476-
HMACKeygenMechanism:
477-
default: CKM_GENERIC_SECRET_KEY_GEN
478-
type: string
479-
HMACLabel:
480-
type: string
481-
HMACMechanism:
482-
default: CKM_SHA256_HMAC
483-
type: string
484-
MKEKLabel:
485-
type: string
486-
MKEKLength:
487-
default: 32
488-
type: integer
489-
OSLockingOK:
490-
default: false
491-
type: boolean
492-
alwaysSetCKASensitive:
493-
default: true
494-
type: boolean
495-
certificatesMountPoint:
496-
type: string
497-
certificatesSecret:
473+
clientDataPath:
474+
default: /etc/hsm-client
498475
type: string
499-
clientAddress:
500-
type: string
501-
encryptionMechanism:
502-
default: CKM_AES_GCM
503-
type: string
504-
keyWrapGenerateIV:
505-
default: true
506-
type: boolean
507-
keyWrapMechanism:
508-
default: CKM_AES_KEY_WRAP_KWP
476+
clientDataSecret:
509477
type: string
510-
libraryPath:
511-
type: string
512-
loggingLevel:
513-
default: 4
514-
maximum: 7
515-
minimum: 0
516-
type: integer
517478
loginSecret:
518479
type: string
519-
serverAddress:
520-
type: string
521-
slotId:
522-
type: string
523-
tokenLabels:
524-
type: string
525-
tokenSerialNumber:
526-
type: string
527-
type:
528-
type: string
529480
required:
530-
- HMACLabel
531-
- MKEKLabel
532-
- libraryPath
481+
- clientDataSecret
533482
- loginSecret
534-
- serverAddress
535-
- type
536483
type: object
537484
preserveJobs:
538485
default: false
@@ -6214,6 +6161,8 @@ spec:
62146161
type: integer
62156162
httpdCustomization:
62166163
properties:
6164+
customConfigSecret:
6165+
type: string
62176166
processNumber:
62186167
default: 3
62196168
format: int32
@@ -15789,6 +15738,9 @@ spec:
1578915738
enabled:
1579015739
default: true
1579115740
type: boolean
15741+
ksmEnabled:
15742+
default: true
15743+
type: boolean
1579215744
ksmTls:
1579315745
properties:
1579415746
caBundleSecretName:
@@ -15812,6 +15764,7 @@ spec:
1581215764
items:
1581315765
type: string
1581415766
type: array
15767+
x-kubernetes-list-type: atomic
1581515768
nodeSelector:
1581615769
additionalProperties:
1581715770
type: string
@@ -16534,6 +16487,11 @@ spec:
1653416487
type: string
1653516488
type: object
1653616489
type: object
16490+
networkAttachments:
16491+
items:
16492+
type: string
16493+
type: array
16494+
x-kubernetes-list-type: atomic
1653716495
prometheusTls:
1653816496
properties:
1653916497
caBundleSecretName:

apis/go.mod

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,37 @@ require (
77
github.com/go-playground/validator/v10 v10.22.1
88
github.com/onsi/ginkgo/v2 v2.20.1
99
github.com/onsi/gomega v1.34.1
10-
github.com/openstack-k8s-operators/barbican-operator/api v0.5.1-0.20250114105137-ffbe4b44312c
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20241217072755-fb4d39411ad2
12-
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20250113135558-c44a8799bd60
13-
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20250109233430-f208aa212181
14-
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250107183423-65b8e596796a
15-
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250106004957-8f2f2c4a1720
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250114103227-09deb192370f
10+
github.com/openstack-k8s-operators/barbican-operator/api v0.5.1-0.20250127073547-cf83ce8088a0
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20250122131751-fa5a7a53e15d
12+
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20250205122129-ae40ae1d9504
13+
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20250126100316-be560a599e2d
14+
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250129204831-17deaa376556
15+
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250203063315-e5e6165191f8
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250204091142-ae8379c31edb
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250107140737-1d83138767c2
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250113154337-ece4d21f3ed9
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250113155806-c6542cc4eb2b
20-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250113155806-c6542cc4eb2b
21-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250112074607-12e4c8fce4e1
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250114123606-99679fd7aabe
23-
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250113174834-092188dbb0ca
24-
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250113105937-70784bbb8ddd
25-
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250114104851-575fc03d6b94
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250114121407-07c61df54c33
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250107161655-560140ff3cb0
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250203105048-182afa0c45d8
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250205143454-43504d7ad19a
20+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250205143454-43504d7ad19a
21+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250126093016-ccebb1946294
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250130183307-cd27e92d7620
23+
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250123151805-ee0b6cafae52
24+
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250129114118-0933c978bad4
25+
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250204150806-a8e38cac8de0
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250204103128-f4aca08eca76
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250204081936-e9c027e0a2b8
2828
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241223152937-5c39b092c37f
29-
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250107153542-fb9c65d9aa6f
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250113133356-286a91287f17
29+
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250127070538-5d5c2809b81a
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250205132728-e1506f7561a1
3131
github.com/rabbitmq/cluster-operator/v2 v2.11.0
3232
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
3333
github.com/rhobs/observability-operator v0.3.1 // indirect
3434
go.uber.org/multierr v1.11.0 // indirect
3535
go.uber.org/zap v1.27.0 // indirect
3636
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
3737
golang.org/x/tools v0.24.0 // indirect
38-
k8s.io/api v0.29.12
39-
k8s.io/apimachinery v0.29.12
40-
k8s.io/client-go v0.29.12
38+
k8s.io/api v0.29.13
39+
k8s.io/apimachinery v0.29.13
40+
k8s.io/client-go v0.29.13
4141
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
4242
sigs.k8s.io/controller-runtime v0.17.6
4343
)
@@ -78,7 +78,7 @@ require (
7878
github.com/modern-go/reflect2 v1.0.2 // indirect
7979
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8080
github.com/openshift/api v3.9.0+incompatible // indirect
81-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250113155806-c6542cc4eb2b // indirect
81+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250205143454-43504d7ad19a // indirect
8282
github.com/pkg/errors v0.9.1 // indirect
8383
github.com/prometheus/client_golang v1.19.0 // indirect
8484
github.com/prometheus/client_model v0.6.0 // indirect
@@ -89,18 +89,18 @@ require (
8989
golang.org/x/crypto v0.26.0 // indirect
9090
golang.org/x/net v0.28.0 // indirect
9191
golang.org/x/oauth2 v0.18.0 // indirect
92-
golang.org/x/sys v0.26.0 // indirect
93-
golang.org/x/term v0.25.0 // indirect
94-
golang.org/x/text v0.19.0 // indirect
92+
golang.org/x/sys v0.29.0 // indirect
93+
golang.org/x/term v0.28.0 // indirect
94+
golang.org/x/text v0.21.0 // indirect
9595
golang.org/x/time v0.5.0 // indirect
9696
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9797
google.golang.org/appengine v1.6.8 // indirect
9898
google.golang.org/protobuf v1.34.1 // indirect
9999
gopkg.in/inf.v0 v0.9.1 // indirect
100100
gopkg.in/yaml.v2 v2.4.0 // indirect
101101
gopkg.in/yaml.v3 v3.0.1 // indirect
102-
k8s.io/apiextensions-apiserver v0.29.12 // indirect
103-
k8s.io/component-base v0.29.12 // indirect
102+
k8s.io/apiextensions-apiserver v0.29.13 // indirect
103+
k8s.io/component-base v0.29.13 // indirect
104104
k8s.io/klog/v2 v2.120.1 // indirect
105105
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
106106
sigs.k8s.io/gateway-api v1.0.0 // indirect

0 commit comments

Comments
 (0)