From 58fe5e9a95133d0e3600a7bae14dda877a348d8c Mon Sep 17 00:00:00 2001 From: Luca Miccini Date: Thu, 28 Aug 2025 12:04:11 +0200 Subject: [PATCH] Bump infra and mariadb operators for 18.0-fr3 Jira: https://issues.redhat.com/browse/OSPCIX-1027 --- ....openstack.org_openstackcontrolplanes.yaml | 124 ++++++++++++++++++ apis/go.mod | 4 +- apis/go.sum | 8 +- bindata/crds/crds.yaml | 124 ++++++++++++++++++ .../crds/mariadb.openstack.org_galeras.yaml | 55 ++++++++ .../memcached.openstack.org_memcacheds.yaml | 55 ++++++++ bindata/crds/redis.openstack.org_redises.yaml | 110 ++++++++++++++++ ....openstack.org_openstackcontrolplanes.yaml | 124 ++++++++++++++++++ config/operator/manager_operator_images.yaml | 4 +- go.mod | 4 +- go.sum | 8 +- hack/export_operator_related_images.sh | 4 +- 12 files changed, 608 insertions(+), 16 deletions(-) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index bd0096461..9682a8cc9 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -3305,6 +3305,37 @@ spec: maximum: 3 minimum: 0 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object secret: type: string storageClass: @@ -8683,6 +8714,37 @@ spec: maximum: 32 minimum: 1 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object tls: properties: caBundleSecretName: @@ -16505,6 +16567,68 @@ spec: default: 1 format: int32 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + sentinelResources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object tls: properties: caBundleSecretName: diff --git a/apis/go.mod b/apis/go.mod index 5cb17e4e0..a370122c6 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -13,13 +13,13 @@ require ( github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250811072343-cbba065c90db github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d15010e0c06 github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4 + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6 github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811082218-9f6971dd853d github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250605082218-a58074898dd7 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250605082218-a58074898dd7 github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d - github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8 + github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441 github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3 github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132816-64db9a82b4e7 github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132817-9363d9afc583 diff --git a/apis/go.sum b/apis/go.sum index 24639905a..401020a9c 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -106,8 +106,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d1 github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d15010e0c06/go.mod h1:TF9uauubr7uLGUcMuauY0i8vzDXra8TIR16pYp2UCr0= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d h1:wiYFJzkZifx3pdMzeEWuIDN/EKL6hRbdfCWJ85nJQSY= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d/go.mod h1:/IuvyuRqeaYi6n+7si6Sis97mzlonEQJEieZOPFa9JQ= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4 h1:MxkB4eTKuFHEcgJiYW3mfdj2WT/wk+jpJrHz+vpp9GY= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6 h1:7pd9ynipcPsoa2TRbro6XUNYS5d9nlyzo1w4JakDcP4= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0 h1:2m6Ewvj+drV4qkmmc5oQPIngZReNlg2sk1PrlvpaXOc= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0/go.mod h1:1e86VB0zL1xLJ1QJUae+Gb8W4KtOBAg0XmP9XvdqvwY= 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 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250605082218-a58074898dd7/go.mod h1:U3LQ4Nz2+syTPfW66bSLv6OzefLpsqxWLdX9AFotRPA= github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d h1:SlGKhm0JckKr7xndTvY/xzKHyX1A2O2BXOzniv+S/Mo= github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d/go.mod h1:S0kr2taXPe8hMa/KwUIq/KZofBAIZrPxQQbvAOPv5+Q= -github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8 h1:XJnSf2rE9JMpzSEiZD73cLuZuLS2a6XfXQGIctneRo8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8/go.mod h1:SGqRnej7CJ6Jrd2sOov6CQneGjM6q+Y2azQay3A1KtY= +github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441 h1:PY44eVvgmycLUeNC9AjH79O9SExWtPkZ/j5sICa4UII= +github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441/go.mod h1:/hd8qdvmSRMjCDtlYfsis5vMoUJatXT8GbY+dPLvlkY= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3 h1:CSW1NzY+GPDf1RK8PGNwP0xX21og54N4YnXgPH6+HZQ= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3/go.mod h1:ZqRwfU8EjT7uo643DQInzSWUNkAco0B7INl4KbfHuxo= github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132816-64db9a82b4e7 h1:Ics99PkqHzUXFuPmL97kOQIWbKtL9VdRVACB5v8s1Xc= diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml index ea4bc6f2c..224f383c8 100644 --- a/bindata/crds/crds.yaml +++ b/bindata/crds/crds.yaml @@ -3469,6 +3469,37 @@ spec: maximum: 3 minimum: 0 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object secret: type: string storageClass: @@ -8847,6 +8878,37 @@ spec: maximum: 32 minimum: 1 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object tls: properties: caBundleSecretName: @@ -16669,6 +16731,68 @@ spec: default: 1 format: int32 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + sentinelResources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object tls: properties: caBundleSecretName: diff --git a/bindata/crds/mariadb.openstack.org_galeras.yaml b/bindata/crds/mariadb.openstack.org_galeras.yaml index 0bc9d8a9f..ebd35bd24 100644 --- a/bindata/crds/mariadb.openstack.org_galeras.yaml +++ b/bindata/crds/mariadb.openstack.org_galeras.yaml @@ -78,6 +78,61 @@ spec: maximum: 3 minimum: 0 type: integer + resources: + description: Resources QoS configuration for pods + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object secret: description: Name of the secret to look for password keys type: string diff --git a/bindata/crds/memcached.openstack.org_memcacheds.yaml b/bindata/crds/memcached.openstack.org_memcacheds.yaml index db3351e32..9c5161bca 100644 --- a/bindata/crds/memcached.openstack.org_memcacheds.yaml +++ b/bindata/crds/memcached.openstack.org_memcacheds.yaml @@ -75,6 +75,61 @@ spec: maximum: 32 minimum: 1 type: integer + resources: + description: Resources QoS configuration for pods + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object tls: description: TLS settings for memcached service properties: diff --git a/bindata/crds/redis.openstack.org_redises.yaml b/bindata/crds/redis.openstack.org_redises.yaml index 52a161f47..e4f4c3bf7 100644 --- a/bindata/crds/redis.openstack.org_redises.yaml +++ b/bindata/crds/redis.openstack.org_redises.yaml @@ -63,6 +63,116 @@ spec: description: Size of the redis cluster format: int32 type: integer + resources: + description: Resources QoS configuration for redis servers + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + sentinelResources: + description: Resources QoS configuration for sentinel servers + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object tls: description: TLS settings for Redis service and internal Redis replication properties: diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index bd0096461..9682a8cc9 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -3305,6 +3305,37 @@ spec: maximum: 3 minimum: 0 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object secret: type: string storageClass: @@ -8683,6 +8714,37 @@ spec: maximum: 32 minimum: 1 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object tls: properties: caBundleSecretName: @@ -16505,6 +16567,68 @@ spec: default: 1 format: int32 type: integer + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + sentinelResources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object tls: properties: caBundleSecretName: diff --git a/config/operator/manager_operator_images.yaml b/config/operator/manager_operator_images.yaml index 63197cb39..f3d1047d8 100644 --- a/config/operator/manager_operator_images.yaml +++ b/config/operator/manager_operator_images.yaml @@ -26,7 +26,7 @@ spec: - name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/horizon-operator@sha256:95b67fbe7e969790fa562b4edb196d0654b3c70f1d16ffb7db938689c474c1dc - name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL - value: quay.io/openstack-k8s-operators/infra-operator@sha256:ec1432718f161ae31653ed575e7e7f7ba855965a2153efe152812b4819d21c16 + value: quay.io/openstack-k8s-operators/infra-operator@sha256:0ca0217eed076edb41ca9edf9211b9fc8f624dd74a6b238237951e3f9dd34edb - name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/ironic-operator@sha256:8c3d013259f67833b7102ece81a96223232857c5051abd1d641ed568dc1e635d - name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL @@ -34,7 +34,7 @@ spec: - name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/manila-operator@sha256:a73db09b0ca8b5f648a3f3cf8a104dcd178049e50440b72d2d8fa0c152043f59 - name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL - value: quay.io/openstack-k8s-operators/mariadb-operator@sha256:56976a1c8d1857b7389a709b874af5c45ec4d715062fa1121f853957ca86fdc0 + value: quay.io/openstack-k8s-operators/mariadb-operator@sha256:6d4b256783367562916f6e2c66b64c834ee06fbe6e3484c24c3fd6612a78ace4 - name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/neutron-operator@sha256:e58f246a238354a09a7ecc09b0b0b740ad6c16f8abd1edc01c5b6c2d74158fe2 - name: RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL diff --git a/go.mod b/go.mod index 1bff21c19..0b8d5e14b 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250811072343-cbba065c90db github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d15010e0c06 github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4 + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6 github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811082218-9f6971dd853d github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250605082218-a58074898dd7 @@ -27,7 +27,7 @@ require ( github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250605082218-a58074898dd7 github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250605082218-a58074898dd7 github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d - github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8 + github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441 github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3 github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132816-64db9a82b4e7 github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132817-9363d9afc583 diff --git a/go.sum b/go.sum index 5b0674579..b135aa0b7 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d1 github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811063918-3d15010e0c06/go.mod h1:TF9uauubr7uLGUcMuauY0i8vzDXra8TIR16pYp2UCr0= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d h1:wiYFJzkZifx3pdMzeEWuIDN/EKL6hRbdfCWJ85nJQSY= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-3555bbab149d/go.mod h1:/IuvyuRqeaYi6n+7si6Sis97mzlonEQJEieZOPFa9JQ= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4 h1:MxkB4eTKuFHEcgJiYW3mfdj2WT/wk+jpJrHz+vpp9GY= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250730105425-ac390cdfa7a4/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6 h1:7pd9ynipcPsoa2TRbro6XUNYS5d9nlyzo1w4JakDcP4= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250825154944-f18bd7894ed6/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0 h1:2m6Ewvj+drV4qkmmc5oQPIngZReNlg2sk1PrlvpaXOc= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250811072344-b7d2113b85c0/go.mod h1:1e86VB0zL1xLJ1QJUae+Gb8W4KtOBAg0XmP9XvdqvwY= github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811082218-9f6971dd853d h1:Jyjh0UUDPco6EZMVlGvWRxJ4M1EC4KXSYcOE5p8IsxI= @@ -130,8 +130,8 @@ github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.202506050822 github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250605082218-a58074898dd7/go.mod h1:L3t8ty8BYur+yQC4EbxolVOU85A62oxODM5rMApOwfc= github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d h1:SlGKhm0JckKr7xndTvY/xzKHyX1A2O2BXOzniv+S/Mo= github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811071515-76cd9351439d/go.mod h1:S0kr2taXPe8hMa/KwUIq/KZofBAIZrPxQQbvAOPv5+Q= -github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8 h1:XJnSf2rE9JMpzSEiZD73cLuZuLS2a6XfXQGIctneRo8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250805111929-e9cf53277ec8/go.mod h1:SGqRnej7CJ6Jrd2sOov6CQneGjM6q+Y2azQay3A1KtY= +github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441 h1:PY44eVvgmycLUeNC9AjH79O9SExWtPkZ/j5sICa4UII= +github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250825154944-213306df7441/go.mod h1:/hd8qdvmSRMjCDtlYfsis5vMoUJatXT8GbY+dPLvlkY= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3 h1:CSW1NzY+GPDf1RK8PGNwP0xX21og54N4YnXgPH6+HZQ= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811132527-ecc862b2a7b3/go.mod h1:ZqRwfU8EjT7uo643DQInzSWUNkAco0B7INl4KbfHuxo= github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132816-64db9a82b4e7 h1:Ics99PkqHzUXFuPmL97kOQIWbKtL9VdRVACB5v8s1Xc= diff --git a/hack/export_operator_related_images.sh b/hack/export_operator_related_images.sh index 921c017d4..1f93942f9 100644 --- a/hack/export_operator_related_images.sh +++ b/hack/export_operator_related_images.sh @@ -6,11 +6,11 @@ export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s- export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:632463480216a0cd6067d826ea290fc034f505c133d08c8efda5f13a4d8df110 export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:2d868a499f3d45c85ee833c2dfff52ad1f4f9d6ac952d884bcc539606a50d696 export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:95b67fbe7e969790fa562b4edb196d0654b3c70f1d16ffb7db938689c474c1dc -export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:ec1432718f161ae31653ed575e7e7f7ba855965a2153efe152812b4819d21c16 +export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:0ca0217eed076edb41ca9edf9211b9fc8f624dd74a6b238237951e3f9dd34edb export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:8c3d013259f67833b7102ece81a96223232857c5051abd1d641ed568dc1e635d export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:447b990f1153deddc45781e449193de0f7935d95384474aac2d4a59d2931fd2c export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:a73db09b0ca8b5f648a3f3cf8a104dcd178049e50440b72d2d8fa0c152043f59 -export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:56976a1c8d1857b7389a709b874af5c45ec4d715062fa1121f853957ca86fdc0 +export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:6d4b256783367562916f6e2c66b64c834ee06fbe6e3484c24c3fd6612a78ace4 export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:e58f246a238354a09a7ecc09b0b0b740ad6c16f8abd1edc01c5b6c2d74158fe2 export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:da324acd36c9c781d8769b413da12c4d281c3e400b4165e0e5c8a75a8cc5edc5 export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:c9d8dd9d821e91e056e20ba6ca83a3a3a3da9b10a0478a7be6146c6dd4168677