Skip to content

Commit cbc36ed

Browse files
lmiccinilmiccini
committed
Bump infra and mariadb operators for 18.0-fr3
Jira: https://issues.redhat.com/browse/OSPCIX-1027
1 parent c76e3f1 commit cbc36ed

11 files changed

+484
-16
lines changed

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

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3305,6 +3305,37 @@ spec:
33053305
maximum: 3
33063306
minimum: 0
33073307
type: integer
3308+
resources:
3309+
properties:
3310+
claims:
3311+
items:
3312+
properties:
3313+
name:
3314+
type: string
3315+
required:
3316+
- name
3317+
type: object
3318+
type: array
3319+
x-kubernetes-list-map-keys:
3320+
- name
3321+
x-kubernetes-list-type: map
3322+
limits:
3323+
additionalProperties:
3324+
anyOf:
3325+
- type: integer
3326+
- type: string
3327+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
3328+
x-kubernetes-int-or-string: true
3329+
type: object
3330+
requests:
3331+
additionalProperties:
3332+
anyOf:
3333+
- type: integer
3334+
- type: string
3335+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
3336+
x-kubernetes-int-or-string: true
3337+
type: object
3338+
type: object
33083339
secret:
33093340
type: string
33103341
storageClass:
@@ -8683,6 +8714,37 @@ spec:
86838714
maximum: 32
86848715
minimum: 1
86858716
type: integer
8717+
resources:
8718+
properties:
8719+
claims:
8720+
items:
8721+
properties:
8722+
name:
8723+
type: string
8724+
required:
8725+
- name
8726+
type: object
8727+
type: array
8728+
x-kubernetes-list-map-keys:
8729+
- name
8730+
x-kubernetes-list-type: map
8731+
limits:
8732+
additionalProperties:
8733+
anyOf:
8734+
- type: integer
8735+
- type: string
8736+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
8737+
x-kubernetes-int-or-string: true
8738+
type: object
8739+
requests:
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+
type: object
86868748
tls:
86878749
properties:
86888750
caBundleSecretName:
@@ -16505,6 +16567,68 @@ spec:
1650516567
default: 1
1650616568
format: int32
1650716569
type: integer
16570+
resources:
16571+
properties:
16572+
claims:
16573+
items:
16574+
properties:
16575+
name:
16576+
type: string
16577+
required:
16578+
- name
16579+
type: object
16580+
type: array
16581+
x-kubernetes-list-map-keys:
16582+
- name
16583+
x-kubernetes-list-type: map
16584+
limits:
16585+
additionalProperties:
16586+
anyOf:
16587+
- type: integer
16588+
- type: string
16589+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
16590+
x-kubernetes-int-or-string: true
16591+
type: object
16592+
requests:
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+
type: object
16601+
sentinelResources:
16602+
properties:
16603+
claims:
16604+
items:
16605+
properties:
16606+
name:
16607+
type: string
16608+
required:
16609+
- name
16610+
type: object
16611+
type: array
16612+
x-kubernetes-list-map-keys:
16613+
- name
16614+
x-kubernetes-list-type: map
16615+
limits:
16616+
additionalProperties:
16617+
anyOf:
16618+
- type: integer
16619+
- type: string
16620+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
16621+
x-kubernetes-int-or-string: true
16622+
type: object
16623+
requests:
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+
type: object
1650816632
tls:
1650916633
properties:
1651016634
caBundleSecretName:

‎apis/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ require (
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250811072343-cbba065c90db
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d15010e0c06
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811082218-9f6971dd853d
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
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132816-64db9a82b4e7
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132817-9363d9afc583

‎apis/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d1
106106
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d15010e0c06/go.mod h1:TF9uauubr7uLGUcMuauY0i8vzDXra8TIR16pYp2UCr0=
107107
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d h1:wiYFJzkZifx3pdMzeEWuIDN/EKL6hRbdfCWJ85nJQSY=
108108
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d/go.mod h1:/IuvyuRqeaYi6n+7si6Sis97mzlonEQJEieZOPFa9JQ=
109-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4 h1:MxkB4eTKuFHEcgJiYW3mfdj2WT/wk+jpJrHz+vpp9GY=
110-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
109+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6 h1:7pd9ynipcPsoa2TRbro6XUNYS5d9nlyzo1w4JakDcP4=
110+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
111111
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0 h1:2m6Ewvj+drV4qkmmc5oQPIngZReNlg2sk1PrlvpaXOc=
112112
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0/go.mod h1:1e86VB0zL1xLJ1QJUae+Gb8W4KtOBAg0XmP9XvdqvwY=
113113
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811082218-9f6971dd853d h1:Jyjh0UUDPco6EZMVlGvWRxJ4M1EC4KXSYcOE5p8IsxI=
@@ -120,8 +120,8 @@ github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.202506050
120120
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250605082218-a58074898dd7/go.mod h1:U3LQ4Nz2+syTPfW66bSLv6OzefLpsqxWLdX9AFotRPA=
121121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d h1:SlGKhm0JckKr7xndTvY/xzKHyX1A2O2BXOzniv+S/Mo=
122122
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d/go.mod h1:S0kr2taXPe8hMa/KwUIq/KZofBAIZrPxQQbvAOPv5+Q=
123-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8 h1:XJnSf2rE9JMpzSEiZD73cLuZuLS2a6XfXQGIctneRo8=
124-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8/go.mod h1:SGqRnej7CJ6Jrd2sOov6CQneGjM6q+Y2azQay3A1KtY=
123+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441 h1:PY44eVvgmycLUeNC9AjH79O9SExWtPkZ/j5sICa4UII=
124+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441/go.mod h1:/hd8qdvmSRMjCDtlYfsis5vMoUJatXT8GbY+dPLvlkY=
125125
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3 h1:CSW1NzY+GPDf1RK8PGNwP0xX21og54N4YnXgPH6+HZQ=
126126
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3/go.mod h1:ZqRwfU8EjT7uo643DQInzSWUNkAco0B7INl4KbfHuxo=
127127
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132816-64db9a82b4e7 h1:Ics99PkqHzUXFuPmL97kOQIWbKtL9VdRVACB5v8s1Xc=

‎bindata/crds/mariadb.openstack.org_galeras.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,61 @@ spec:
7878
maximum: 3
7979
minimum: 0
8080
type: integer
81+
resources:
82+
description: Resources QoS configuration for pods
83+
properties:
84+
claims:
85+
description: |-
86+
Claims lists the names of resources, defined in spec.resourceClaims,
87+
that are used by this container.
88+
89+
90+
This is an alpha field and requires enabling the
91+
DynamicResourceAllocation feature gate.
92+
93+
94+
This field is immutable. It can only be set for containers.
95+
items:
96+
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
97+
properties:
98+
name:
99+
description: |-
100+
Name must match the name of one entry in pod.spec.resourceClaims of
101+
the Pod where this field is used. It makes that resource available
102+
inside a container.
103+
type: string
104+
required:
105+
- name
106+
type: object
107+
type: array
108+
x-kubernetes-list-map-keys:
109+
- name
110+
x-kubernetes-list-type: map
111+
limits:
112+
additionalProperties:
113+
anyOf:
114+
- type: integer
115+
- type: string
116+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
117+
x-kubernetes-int-or-string: true
118+
description: |-
119+
Limits describes the maximum amount of compute resources allowed.
120+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
121+
type: object
122+
requests:
123+
additionalProperties:
124+
anyOf:
125+
- type: integer
126+
- type: string
127+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
128+
x-kubernetes-int-or-string: true
129+
description: |-
130+
Requests describes the minimum amount of compute resources required.
131+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
132+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
133+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
134+
type: object
135+
type: object
81136
secret:
82137
description: Name of the secret to look for password keys
83138
type: string

‎bindata/crds/memcached.openstack.org_memcacheds.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,61 @@ spec:
7575
maximum: 32
7676
minimum: 1
7777
type: integer
78+
resources:
79+
description: Resources QoS configuration for pods
80+
properties:
81+
claims:
82+
description: |-
83+
Claims lists the names of resources, defined in spec.resourceClaims,
84+
that are used by this container.
85+
86+
87+
This is an alpha field and requires enabling the
88+
DynamicResourceAllocation feature gate.
89+
90+
91+
This field is immutable. It can only be set for containers.
92+
items:
93+
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
94+
properties:
95+
name:
96+
description: |-
97+
Name must match the name of one entry in pod.spec.resourceClaims of
98+
the Pod where this field is used. It makes that resource available
99+
inside a container.
100+
type: string
101+
required:
102+
- name
103+
type: object
104+
type: array
105+
x-kubernetes-list-map-keys:
106+
- name
107+
x-kubernetes-list-type: map
108+
limits:
109+
additionalProperties:
110+
anyOf:
111+
- type: integer
112+
- type: string
113+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
114+
x-kubernetes-int-or-string: true
115+
description: |-
116+
Limits describes the maximum amount of compute resources allowed.
117+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
118+
type: object
119+
requests:
120+
additionalProperties:
121+
anyOf:
122+
- type: integer
123+
- type: string
124+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
125+
x-kubernetes-int-or-string: true
126+
description: |-
127+
Requests describes the minimum amount of compute resources required.
128+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
129+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
130+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
131+
type: object
132+
type: object
78133
tls:
79134
description: TLS settings for memcached service
80135
properties:

0 commit comments

Comments
 (0)