Skip to content

Commit e4bd7b5

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1515 from openstack-k8s-operators/openstack-dependency-bump/main
openstack-k8s-operators dependency bump branch: main
2 parents 1304b79 + 42b3c8e commit e4bd7b5

23 files changed

+777
-125
lines changed

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

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,6 +1497,8 @@ spec:
14971497
additionalProperties:
14981498
type: string
14991499
type: object
1500+
notificationBusInstance:
1501+
type: string
15001502
passwordSelectors:
15011503
default:
15021504
service: CinderPassword
@@ -3305,6 +3307,37 @@ spec:
33053307
maximum: 3
33063308
minimum: 0
33073309
type: integer
3310+
resources:
3311+
properties:
3312+
claims:
3313+
items:
3314+
properties:
3315+
name:
3316+
type: string
3317+
required:
3318+
- name
3319+
type: object
3320+
type: array
3321+
x-kubernetes-list-map-keys:
3322+
- name
3323+
x-kubernetes-list-type: map
3324+
limits:
3325+
additionalProperties:
3326+
anyOf:
3327+
- type: integer
3328+
- type: string
3329+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
3330+
x-kubernetes-int-or-string: true
3331+
type: object
3332+
requests:
3333+
additionalProperties:
3334+
anyOf:
3335+
- type: integer
3336+
- type: string
3337+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
3338+
x-kubernetes-int-or-string: true
3339+
type: object
3340+
type: object
33083341
secret:
33093342
type: string
33103343
storageClass:
@@ -7535,6 +7568,10 @@ spec:
75357568
- extraVol
75367569
type: object
75377570
type: array
7571+
federatedRealmConfig:
7572+
type: string
7573+
federationMountPath:
7574+
type: string
75387575
fernetMaxActiveKeys:
75397576
default: 5
75407577
format: int32
@@ -8624,6 +8661,8 @@ spec:
86248661
additionalProperties:
86258662
type: string
86268663
type: object
8664+
notificationBusInstance:
8665+
type: string
86278666
passwordSelectors:
86288667
default:
86298668
service: ManilaPassword
@@ -8683,6 +8722,37 @@ spec:
86838722
maximum: 32
86848723
minimum: 1
86858724
type: integer
8725+
resources:
8726+
properties:
8727+
claims:
8728+
items:
8729+
properties:
8730+
name:
8731+
type: string
8732+
required:
8733+
- name
8734+
type: object
8735+
type: array
8736+
x-kubernetes-list-map-keys:
8737+
- name
8738+
x-kubernetes-list-type: map
8739+
limits:
8740+
additionalProperties:
8741+
anyOf:
8742+
- type: integer
8743+
- type: string
8744+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
8745+
x-kubernetes-int-or-string: true
8746+
type: object
8747+
requests:
8748+
additionalProperties:
8749+
anyOf:
8750+
- type: integer
8751+
- type: string
8752+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
8753+
x-kubernetes-int-or-string: true
8754+
type: object
8755+
type: object
86868756
tls:
86878757
properties:
86888758
caBundleSecretName:
@@ -16505,6 +16575,68 @@ spec:
1650516575
default: 1
1650616576
format: int32
1650716577
type: integer
16578+
resources:
16579+
properties:
16580+
claims:
16581+
items:
16582+
properties:
16583+
name:
16584+
type: string
16585+
required:
16586+
- name
16587+
type: object
16588+
type: array
16589+
x-kubernetes-list-map-keys:
16590+
- name
16591+
x-kubernetes-list-type: map
16592+
limits:
16593+
additionalProperties:
16594+
anyOf:
16595+
- type: integer
16596+
- type: string
16597+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
16598+
x-kubernetes-int-or-string: true
16599+
type: object
16600+
requests:
16601+
additionalProperties:
16602+
anyOf:
16603+
- type: integer
16604+
- type: string
16605+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
16606+
x-kubernetes-int-or-string: true
16607+
type: object
16608+
type: object
16609+
sentinelResources:
16610+
properties:
16611+
claims:
16612+
items:
16613+
properties:
16614+
name:
16615+
type: string
16616+
required:
16617+
- name
16618+
type: object
16619+
type: array
16620+
x-kubernetes-list-map-keys:
16621+
- name
16622+
x-kubernetes-list-type: map
16623+
limits:
16624+
additionalProperties:
16625+
anyOf:
16626+
- type: integer
16627+
- type: string
16628+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
16629+
x-kubernetes-int-or-string: true
16630+
type: object
16631+
requests:
16632+
additionalProperties:
16633+
anyOf:
16634+
- type: integer
16635+
- type: string
16636+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
16637+
x-kubernetes-int-or-string: true
16638+
type: object
16639+
type: object
1650816640
tls:
1650916641
properties:
1651016642
caBundleSecretName:

‎apis/go.mod‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ require (
77
github.com/go-playground/validator/v10 v10.25.0
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.6.1-0.20250623153737-3259905481ed
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250623135423-f707a6c72bf8
12-
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.20250621121902-ff5932b36c37
10+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250624170003-81e4d01ca1c7
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250627145328-b31cbe9dc13f
12+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250704161315-35ae50acca4f
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250628074134-418ea4b69d6a
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250620072533-3382b910c69e
15-
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250620072009-47fe36aa7f8f
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250623150058-144ca97000cb
17-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250620085455-c6585c9d26f3
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250620072008-0d8d8c482919
15+
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250705071622-14bd33032cf5
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250630125044-4cb24968c1a6
17+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250704110858-90da9d8d80c2
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250703205702-4b8fc09eb8ae
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.20250623132257-5a335b406522
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250623152315-0b41a4ac28ef
23-
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250623133133-4afb217d2df1
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250630164836-7f1430160831
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250626110655-78effb029b49
23+
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250702105718-b083b86e7437
2424
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.20250624085150-e813e7252d0a
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134040-5b6ea945636b
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250705071622-8267a8b7f6b2
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250630043826-42547373cab9
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250623163837-9c9bcc18b22e
29-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250622201001-ff21b777a402
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250623170302-7c7813a41b79
29+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250627101113-093a6f6e436b
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250704103310-e947500937f6
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
3333
go.uber.org/multierr v1.11.0 // indirect

0 commit comments

Comments
 (0)