Skip to content

Commit eeea0df

Browse files
fmountfmount
committed
Add support for Glance Location API configuration in OpenStack operator
This change integrates the Glance Location API feature exposed by Glance. It enables "single" GlanceAPI StatefulSet deployments with regular backends for RHOSO 19, and it reduces the PVC resource requirements, resulting in a simplified deployment topology. The Location API is controlled via the "glance.openstack.org/location-api" annotation in the Glance CR for backward compatibility, allowing existing deployments to continue to work with the split method while enabling the new single-API deployment model for new (19 based) setups. Signed-off-by: Francesco Pantano <fpantano@redhat.com>
1 parent b10f4cc commit eeea0df

15 files changed

+38
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4658,7 +4658,7 @@ spec:
46584658
type: string
46594659
type: object
46604660
type:
4661-
default: split
4661+
default: single
46624662
enum:
46634663
- split
46644664
- single

‎api/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ spec:
248248
availableServiceDefaults:
249249
additionalProperties:
250250
properties:
251+
glanceLocationAPI:
252+
type: string
251253
glanceWsgi:
252254
type: string
253255
type: object
@@ -683,6 +685,8 @@ spec:
683685
type: integer
684686
serviceDefaults:
685687
properties:
688+
glanceLocationAPI:
689+
type: string
686690
glanceWsgi:
687691
type: string
688692
type: object

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ type ContainerTemplate struct {
178178
// but are associated with a specific OpenStack release version
179179
type ServiceDefaults struct {
180180
GlanceWsgi *string `json:"glanceWsgi,omitempty"`
181+
GlanceLocationAPI *string `json:"glanceLocationAPI,omitempty"`
181182
}
182183

183184
// OpenStackVersionStatus defines the observed state of OpenStackVersion

‎api/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
143143
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
144144

145145
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
146+
147+
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/fmount/glance-operator/api v0.0.0-20260305205814-319db2e0e586

‎api/go.sum‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb
1616
github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
1717
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
1818
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
19+
github.com/fmount/glance-operator/api v0.0.0-20260305205814-319db2e0e586 h1:P5oFM6iatOlJtHatpTqzV20SkUAiFDyKP/tDgFS7MBI=
1920
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
2021
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
2122
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
@@ -120,8 +121,6 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260214081335-e
120121
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260214081335-e97f5c12bd0f/go.mod h1:FATSK+sHg210WxxPnZKHHckqd52z30fpOeldzvpaR0M=
121122
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260226141406-72b1c8326c4d h1:CpW6pBVLG+rWfG7SuWELI5UG1LO29TcD0H6N3kEIbsE=
122123
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260226141406-72b1c8326c4d/go.mod h1:mkTeZcZh2iCVt94RiSLr79dscYlt1mDveArM+Ko4LqU=
123-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260224155146-43189d7b5f44 h1:p+26/PQupwaGs8NHF5TrVDmdcjCik2Nar+panWK5i2U=
124-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260224155146-43189d7b5f44/go.mod h1:mdM4lgeEeNIzKv5zDSpz1ZQYwVyTc5zLahzHonoy4x8=
125124
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260224124345-771b1609979a h1:FZzn4xAr7Gyg08j9DnRL4fzDxMqPPphHQAsc5GafU7U=
126125
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260224124345-771b1609979a/go.mod h1:oCU2YPu91BPMRN8a+gKcct3GRXGaIuBj9JAN73nO4dY=
127126
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260223151854-36176307c2c1 h1:P+yf2BZz5dR5BW8eUHcNK1aQmnHviFZwa0A3D9WPM3g=

‎bindata/crds/crds.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4923,7 +4923,7 @@ spec:
49234923
type: string
49244924
type: object
49254925
type:
4926-
default: split
4926+
default: single
49274927
enum:
49284928
- split
49294929
- single
@@ -21459,6 +21459,8 @@ spec:
2145921459
availableServiceDefaults:
2146021460
additionalProperties:
2146121461
properties:
21462+
glanceLocationAPI:
21463+
type: string
2146221464
glanceWsgi:
2146321465
type: string
2146421466
type: object
@@ -21894,6 +21896,8 @@ spec:
2189421896
type: integer
2189521897
serviceDefaults:
2189621898
properties:
21899+
glanceLocationAPI:
21900+
type: string
2189721901
glanceWsgi:
2189821902
type: string
2189921903
type: object

‎bindata/crds/glance.openstack.org_glanceapis.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
minimum: 1
5959
type: integer
6060
apiType:
61-
default: external
61+
default: single
6262
enum:
6363
- internal
6464
- external
@@ -1581,7 +1581,7 @@ spec:
15811581
type: string
15821582
type: object
15831583
type:
1584-
default: split
1584+
default: single
15851585
description: Type - represents the layout of the glanceAPI deployment.
15861586
enum:
15871587
- split

‎bindata/crds/glance.openstack.org_glances.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ spec:
15751575
type: string
15761576
type: object
15771577
type:
1578-
default: split
1578+
default: single
15791579
description: Type - represents the layout of the glanceAPI deployment.
15801580
enum:
15811581
- split

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4658,7 +4658,7 @@ spec:
46584658
type: string
46594659
type: object
46604660
type:
4661-
default: split
4661+
default: single
46624662
enum:
46634663
- split
46644664
- single

0 commit comments

Comments
 (0)