Skip to content

Commit a4a92dc

Browse files
committed
Update infra-operator
1 parent 6100a85 commit a4a92dc

8 files changed

Lines changed: 216 additions & 6 deletions

File tree

apis/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
116116
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag)
117117
replace github.com/rabbitmq/cluster-operator/v2 => github.com/olliewalsh/rabbitmq-cluster-operator/v2 v2.6.1-0.20250704134320-4a19b2c6f2fd
118118

119-
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/olliewalsh/infra-operator/apis v0.0.0-20250710153752-0bb43354c217
119+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/olliewalsh/infra-operator/apis v0.0.0-20250711174148-2b1b4ce1a63f

apis/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
8888
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
8989
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9090
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
91-
github.com/olliewalsh/infra-operator/apis v0.0.0-20250710153752-0bb43354c217 h1:XDFYf0w7NxOh3CqXH+ld2vywe5ROxNjV7YsLZow2nv0=
92-
github.com/olliewalsh/infra-operator/apis v0.0.0-20250710153752-0bb43354c217/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
91+
github.com/olliewalsh/infra-operator/apis v0.0.0-20250711174148-2b1b4ce1a63f h1:F6Q/Kc9z9tfuTf7sybR06cttmk4stJrQa/CIzNIn4pw=
92+
github.com/olliewalsh/infra-operator/apis v0.0.0-20250711174148-2b1b4ce1a63f/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
9393
github.com/olliewalsh/rabbitmq-cluster-operator/v2 v2.6.1-0.20250704134320-4a19b2c6f2fd h1:ihR1/op/ICXVy7dLMpa9n88BMDXHluiKs1S4I8jfVT0=
9494
github.com/olliewalsh/rabbitmq-cluster-operator/v2 v2.6.1-0.20250704134320-4a19b2c6f2fd/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
9595
github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo=

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:

bindata/crds/redis.openstack.org_redises.yaml

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,116 @@ spec:
6363
description: Size of the redis cluster
6464
format: int32
6565
type: integer
66+
resources:
67+
description: Resources QoS configuration for redis servers
68+
properties:
69+
claims:
70+
description: |-
71+
Claims lists the names of resources, defined in spec.resourceClaims,
72+
that are used by this container.
73+
74+
75+
This is an alpha field and requires enabling the
76+
DynamicResourceAllocation feature gate.
77+
78+
79+
This field is immutable. It can only be set for containers.
80+
items:
81+
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
82+
properties:
83+
name:
84+
description: |-
85+
Name must match the name of one entry in pod.spec.resourceClaims of
86+
the Pod where this field is used. It makes that resource available
87+
inside a container.
88+
type: string
89+
required:
90+
- name
91+
type: object
92+
type: array
93+
x-kubernetes-list-map-keys:
94+
- name
95+
x-kubernetes-list-type: map
96+
limits:
97+
additionalProperties:
98+
anyOf:
99+
- type: integer
100+
- type: string
101+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
102+
x-kubernetes-int-or-string: true
103+
description: |-
104+
Limits describes the maximum amount of compute resources allowed.
105+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
106+
type: object
107+
requests:
108+
additionalProperties:
109+
anyOf:
110+
- type: integer
111+
- type: string
112+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
113+
x-kubernetes-int-or-string: true
114+
description: |-
115+
Requests describes the minimum amount of compute resources required.
116+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
117+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
118+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
119+
type: object
120+
type: object
121+
sentinelResources:
122+
description: Resources QoS configuration for sentinel servers
123+
properties:
124+
claims:
125+
description: |-
126+
Claims lists the names of resources, defined in spec.resourceClaims,
127+
that are used by this container.
128+
129+
130+
This is an alpha field and requires enabling the
131+
DynamicResourceAllocation feature gate.
132+
133+
134+
This field is immutable. It can only be set for containers.
135+
items:
136+
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
137+
properties:
138+
name:
139+
description: |-
140+
Name must match the name of one entry in pod.spec.resourceClaims of
141+
the Pod where this field is used. It makes that resource available
142+
inside a container.
143+
type: string
144+
required:
145+
- name
146+
type: object
147+
type: array
148+
x-kubernetes-list-map-keys:
149+
- name
150+
x-kubernetes-list-type: map
151+
limits:
152+
additionalProperties:
153+
anyOf:
154+
- type: integer
155+
- type: string
156+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
157+
x-kubernetes-int-or-string: true
158+
description: |-
159+
Limits describes the maximum amount of compute resources allowed.
160+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
161+
type: object
162+
requests:
163+
additionalProperties:
164+
anyOf:
165+
- type: integer
166+
- type: string
167+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
168+
x-kubernetes-int-or-string: true
169+
description: |-
170+
Requests describes the minimum amount of compute resources required.
171+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
172+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
173+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
174+
type: object
175+
type: object
66176
tls:
67177
description: TLS settings for Redis service and internal Redis replication
68178
properties:

config/operator/manager_operator_images.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,33 @@ spec:
2525
value: quay.io/openstack-k8s-operators/heat-operator@sha256:e98bc8cb6f92d0fe5188e24b565fe86c89bb74fa0b37015b55ddc00c5db26c9f
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
2727
value: quay.io/openstack-k8s-operators/horizon-operator@sha256:8a2be6c3d8f3fdf59a1d3bb0af2a1ecca14cea98a80f2cef5b8d2f880192e3b1
28+
- name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
29+
value: quay.io/olliewalsh/infra-operator@sha256:5ab9975e711283c59f9326aa22742fabb833f6e6c5dc5bbe4e6598707b570704
30+
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
31+
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:3e4c20feb4e29a1a29966061f8b4a700bde3e646d8a1781dfb447003a23930cb
32+
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
33+
value: quay.io/openstack-k8s-operators/keystone-operator@sha256:73c90c048b9153444d956f7bdc1818ec8ce8beec952c7e75712d3acbc75dd704
34+
- name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
35+
value: quay.io/openstack-k8s-operators/manila-operator@sha256:c8ff6770275e122bfcb701bf96cceeb334767db5295a65d48ca47a591ab60486
36+
- name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL
37+
value: quay.io/openstack-k8s-operators/mariadb-operator@sha256:4d6902559b7f7854ae809fa855a05e5b7df26e7d453ac1dbde9731a67c560936
38+
- name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL
39+
value: quay.io/openstack-k8s-operators/neutron-operator@sha256:7afe4256730723799dcdce9931949414a7357132ea92e262533a842f2d4cf998
40+
- name: RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL
41+
value: quay.io/openstack-k8s-operators/nova-operator@sha256:ef0823f3503ee8b920e2e4d382db11df9af159409afbfbcccf8d007d6ec81698
42+
- name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL
43+
value: quay.io/openstack-k8s-operators/octavia-operator@sha256:106d02acfe16e57e2322eedcc1f57a88993b07254103cfc26dfabd79f6576b5c
44+
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
45+
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:4c7f51850c216e03dc2b442d52d35ce5a13fd7384192da770ab425cafa21d16e
46+
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
47+
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:ed4a7eba6c444f4d0ed91583050962bc8d8bf1afef161d748a8955f0a60f56b6
48+
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
49+
value: quay.io/openstack-k8s-operators/placement-operator@sha256:941d164c2184b2b429837ee67c7768ff616f01343994b780cb0ed251d9caab3b
50+
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL
51+
value: quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
52+
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
53+
value: quay.io/openstack-k8s-operators/swift-operator@sha256:244be50f28a559a933e418d48601307b64a2b1707d783f206953b0ab392f5c43
54+
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
55+
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:2754d5a15e8e5cd69a4538ac5505e466a6f9c4048efa9cc49375ae6e3c5c65cb
56+
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
57+
value: quay.io/openstack-k8s-operators/test-operator@sha256:705f27e1822f6797af847c43c9248be3e68618f7b7f52ad7c75e7f67e5247fde

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
128128
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag)
129129
replace github.com/rabbitmq/cluster-operator/v2 => github.com/olliewalsh/rabbitmq-cluster-operator/v2 v2.6.1-0.20250704134320-4a19b2c6f2fd
130130

131-
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/olliewalsh/infra-operator/apis v0.0.0-20250710153752-0bb43354c217
131+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/olliewalsh/infra-operator/apis v0.0.0-20250711174148-2b1b4ce1a63f

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
9292
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
9393
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9494
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
95-
github.com/olliewalsh/infra-operator/apis v0.0.0-20250710153752-0bb43354c217 h1:XDFYf0w7NxOh3CqXH+ld2vywe5ROxNjV7YsLZow2nv0=
96-
github.com/olliewalsh/infra-operator/apis v0.0.0-20250710153752-0bb43354c217/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
95+
github.com/olliewalsh/infra-operator/apis v0.0.0-20250711174148-2b1b4ce1a63f h1:F6Q/Kc9z9tfuTf7sybR06cttmk4stJrQa/CIzNIn4pw=
96+
github.com/olliewalsh/infra-operator/apis v0.0.0-20250711174148-2b1b4ce1a63f/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
9797
github.com/olliewalsh/rabbitmq-cluster-operator/v2 v2.6.1-0.20250704134320-4a19b2c6f2fd h1:ihR1/op/ICXVy7dLMpa9n88BMDXHluiKs1S4I8jfVT0=
9898
github.com/olliewalsh/rabbitmq-cluster-operator/v2 v2.6.1-0.20250704134320-4a19b2c6f2fd/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
9999
github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo=

hack/export_operator_related_images.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,18 @@ export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-
66
export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:ff01815817a44f7d6b6119782b6c717483b034ff09d32b6be5ce18f2331a5aa6
77
export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:e98bc8cb6f92d0fe5188e24b565fe86c89bb74fa0b37015b55ddc00c5db26c9f
88
export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:8a2be6c3d8f3fdf59a1d3bb0af2a1ecca14cea98a80f2cef5b8d2f880192e3b1
9+
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/olliewalsh/infra-operator@sha256:5ab9975e711283c59f9326aa22742fabb833f6e6c5dc5bbe4e6598707b570704
10+
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:3e4c20feb4e29a1a29966061f8b4a700bde3e646d8a1781dfb447003a23930cb
11+
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:73c90c048b9153444d956f7bdc1818ec8ce8beec952c7e75712d3acbc75dd704
12+
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:c8ff6770275e122bfcb701bf96cceeb334767db5295a65d48ca47a591ab60486
13+
export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:4d6902559b7f7854ae809fa855a05e5b7df26e7d453ac1dbde9731a67c560936
14+
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:7afe4256730723799dcdce9931949414a7357132ea92e262533a842f2d4cf998
15+
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:ef0823f3503ee8b920e2e4d382db11df9af159409afbfbcccf8d007d6ec81698
16+
export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:106d02acfe16e57e2322eedcc1f57a88993b07254103cfc26dfabd79f6576b5c
17+
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:4c7f51850c216e03dc2b442d52d35ce5a13fd7384192da770ab425cafa21d16e
18+
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:ed4a7eba6c444f4d0ed91583050962bc8d8bf1afef161d748a8955f0a60f56b6
19+
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:941d164c2184b2b429837ee67c7768ff616f01343994b780cb0ed251d9caab3b
20+
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
21+
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:244be50f28a559a933e418d48601307b64a2b1707d783f206953b0ab392f5c43
22+
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:2754d5a15e8e5cd69a4538ac5505e466a6f9c4048efa9cc49375ae6e3c5c65cb
23+
export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:705f27e1822f6797af847c43c9248be3e68618f7b7f52ad7c75e7f67e5247fde

0 commit comments

Comments
 (0)