Skip to content

Commit c080dc8

Browse files
author
OpenStack K8s CI
committed
Update openstack-k8s-operators
1 parent 68357b2 commit c080dc8

6 files changed

Lines changed: 451 additions & 207 deletions

File tree

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,22 @@ spec:
429429
additionalProperties:
430430
type: string
431431
type: object
432+
enabledSecretStores:
433+
items:
434+
enum:
435+
- simple_crypto
436+
- pkcs11
437+
type: string
438+
maxItems: 2
439+
minItems: 1
440+
type: array
441+
x-kubernetes-list-type: set
442+
globalDefaultSecretStore:
443+
default: simple_crypto
444+
enum:
445+
- simple_crypto
446+
- pkcs11
447+
type: string
432448
nodeSelector:
433449
additionalProperties:
434450
type: string
@@ -445,6 +461,75 @@ spec:
445461
default: SimpleCryptoKEK
446462
type: string
447463
type: object
464+
pkcs11:
465+
properties:
466+
AESGCMGenerateIV:
467+
default: true
468+
type: boolean
469+
HMACKeyType:
470+
default: CKK_GENERIC_SECRET
471+
type: string
472+
HMACKeygenMechanism:
473+
default: CKM_GENERIC_SECRET_KEY_GEN
474+
type: string
475+
HMACLabel:
476+
type: string
477+
HMACMechanism:
478+
default: CKM_SHA256_HMAC
479+
type: string
480+
MKEKLabel:
481+
type: string
482+
MKEKLength:
483+
default: 32
484+
type: integer
485+
OSLockingOK:
486+
default: false
487+
type: boolean
488+
alwaysSetCKASensitive:
489+
default: true
490+
type: boolean
491+
certificatesMountPoint:
492+
type: string
493+
certificatesSecret:
494+
type: string
495+
clientAddress:
496+
type: string
497+
encryptionMechanism:
498+
default: CKM_AES_GCM
499+
type: string
500+
keyWrapGenerateIV:
501+
default: true
502+
type: boolean
503+
keyWrapMechanism:
504+
default: CKM_AES_KEY_WRAP_KWP
505+
type: string
506+
libraryPath:
507+
type: string
508+
loggingLevel:
509+
default: 4
510+
maximum: 7
511+
minimum: 0
512+
type: integer
513+
loginSecret:
514+
type: string
515+
serverAddress:
516+
type: string
517+
slotId:
518+
type: string
519+
tokenLabels:
520+
type: string
521+
tokenSerialNumber:
522+
type: string
523+
type:
524+
type: string
525+
required:
526+
- HMACLabel
527+
- MKEKLabel
528+
- libraryPath
529+
- loginSecret
530+
- serverAddress
531+
- type
532+
type: object
448533
preserveJobs:
449534
default: false
450535
type: boolean
@@ -1868,6 +1953,11 @@ spec:
18681953
default: DesignatePassword
18691954
type: string
18701955
type: object
1956+
redisHostIPs:
1957+
items:
1958+
type: string
1959+
type: array
1960+
x-kubernetes-list-type: atomic
18711961
replicas:
18721962
default: 1
18731963
format: int32
@@ -1928,6 +2018,9 @@ spec:
19282018
type: string
19292019
backendWorkerServerProtocol:
19302020
type: string
2021+
controlNetworkName:
2022+
default: designate
2023+
type: string
19312024
customServiceConfig:
19322025
type: string
19332026
customServiceConfigSecrets:
@@ -1959,6 +2052,12 @@ spec:
19592052
default: DesignatePassword
19602053
type: string
19612054
type: object
2055+
replicas:
2056+
default: 1
2057+
format: int32
2058+
maximum: 32
2059+
minimum: 0
2060+
type: integer
19622061
resources:
19632062
properties:
19642063
claims:
@@ -2047,6 +2146,11 @@ spec:
20472146
default: DesignatePassword
20482147
type: string
20492148
type: object
2149+
redisHostIPs:
2150+
items:
2151+
type: string
2152+
type: array
2153+
x-kubernetes-list-type: atomic
20502154
replicas:
20512155
default: 1
20522156
format: int32
@@ -2268,6 +2372,9 @@ spec:
22682372
rabbitMqClusterName:
22692373
default: rabbitmq
22702374
type: string
2375+
redisServiceName:
2376+
default: designate-redis
2377+
type: string
22712378
resources:
22722379
properties:
22732380
claims:
@@ -9312,6 +9419,9 @@ spec:
93129419
serviceUser:
93139420
default: octavia
93149421
type: string
9422+
tenantName:
9423+
default: service
9424+
type: string
93159425
tls:
93169426
properties:
93179427
api:
@@ -15645,6 +15755,18 @@ spec:
1564515755
secretName:
1564615756
type: string
1564715757
type: object
15758+
mysqldExporterDatabaseAccountPrefix:
15759+
default: mysqld-exporter
15760+
type: string
15761+
mysqldExporterEnabled:
15762+
type: boolean
15763+
mysqldExporterTLS:
15764+
properties:
15765+
caBundleSecretName:
15766+
type: string
15767+
secretName:
15768+
type: string
15769+
type: object
1564815770
networkAttachmentDefinitions:
1564915771
items:
1565015772
type: string

apis/go.mod

Lines changed: 33 additions & 33 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.20241120105734-37d5a9b81262
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20241120063916-9e97663361d3
12-
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20241120164406-c06a12f2e42c
13-
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20241120062804-89e9fe93e886
14-
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241120140156-1c476cfe7c63
15-
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241119161147-c38568cb3fb0
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241120235143-b225194fd0fd
17-
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20241120225637-63d25e2bf291
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20241122081244-322aab6fa1e8
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241114091812-6dc9fd0961dc
20-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20241114091812-6dc9fd0961dc
21-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20241121093406-bfd56f125086
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241121162930-c6bef3ccad2a
23-
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241121095318-591a3bcbcda6
24-
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241119125634-42b7b8417b48
25-
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241121093935-bc64ab6db016
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241122072559-3d33d3d18639
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241121095319-a34ad51b8446
28-
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241119131546-e4c1ba679d22
29-
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20241121093118-6ab57de4e6cc
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20241121100420-f2c8dd9aa6c3
10+
github.com/openstack-k8s-operators/barbican-operator/api v0.5.1-0.20241212171110-42e8034603b8
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20241212155337-9941c12cc5e8
12+
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20241216120703-7bc56aa6e9eb
13+
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20241212163210-d8e6e137a60f
14+
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241216080419-1491a54db2a6
15+
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241213092825-f5fcda77cfdc
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241213080025-18e54a028c8b
17+
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20241213092540-3faa669d8404
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20241212135809-dc78e7221d12
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241216113837-d172b3ac0f4e
20+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20241216113837-d172b3ac0f4e
21+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20241216093220-110a2dbd9f71
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241212160155-4e7d8f749820
23+
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241213080309-6be30e8319f7
24+
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241212190415-afc9663cf07d
25+
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241213092256-ceff33a9db28
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241212053721-6f26588f35ee
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241209181431-5d6fb2e8f373
28+
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241212133036-92a44b20c65b
29+
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20241212161537-477944c823f4
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20241213223547-ff87fed29162
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.11
39-
k8s.io/apimachinery v0.29.11
40-
k8s.io/client-go v0.29.11
38+
k8s.io/api v0.29.12
39+
k8s.io/apimachinery v0.29.12
40+
k8s.io/client-go v0.29.12
4141
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
4242
sigs.k8s.io/controller-runtime v0.17.6
4343
)
@@ -46,15 +46,15 @@ require (
4646
github.com/beorn7/perks v1.0.1 // indirect
4747
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4848
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
49-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
49+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
5050
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5151
github.com/fsnotify/fsnotify v1.7.0 // indirect
5252
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
5353
github.com/go-logr/logr v1.4.2 // indirect
5454
github.com/go-logr/zapr v1.3.0 // indirect
55-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
56-
github.com/go-openapi/jsonreference v0.20.4 // indirect
57-
github.com/go-openapi/swag v0.22.9 // indirect
55+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
56+
github.com/go-openapi/jsonreference v0.21.0 // indirect
57+
github.com/go-openapi/swag v0.23.0 // indirect
5858
github.com/go-playground/locales v0.14.1 // indirect
5959
github.com/go-playground/universal-translator v0.18.1 // indirect
6060
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
@@ -78,12 +78,12 @@ 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.20241114091812-6dc9fd0961dc // indirect
81+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20241216113837-d172b3ac0f4e // 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
8585
github.com/prometheus/common v0.53.0 // indirect
86-
github.com/prometheus/procfs v0.12.0 // indirect
86+
github.com/prometheus/procfs v0.13.0 // indirect
8787
github.com/robfig/cron/v3 v3.0.1 // indirect
8888
github.com/spf13/pflag v1.0.5 // indirect
8989
golang.org/x/crypto v0.26.0 // indirect
@@ -99,10 +99,10 @@ require (
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.11 // indirect
103-
k8s.io/component-base v0.29.11 // indirect
102+
k8s.io/apiextensions-apiserver v0.29.12 // indirect
103+
k8s.io/component-base v0.29.12 // indirect
104104
k8s.io/klog/v2 v2.120.1 // indirect
105-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
105+
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
106106
sigs.k8s.io/gateway-api v1.0.0 // indirect
107107
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
108108
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)