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>

Author: fmount

api/bases/core.openstack.org_openstackversions.yaml

@@ -248,6 +248,8 @@ spec:
               availableServiceDefaults:
                 additionalProperties:
                   properties:
+                    glanceLocationAPI:
+                      type: string
                     glanceWsgi:
                       type: string
                   type: object
@@ -683,6 +685,8 @@ spec:
                 type: integer
               serviceDefaults:
                 properties:
+                  glanceLocationAPI:
+                    type: string
                   glanceWsgi:
                     type: string
                 type: object

api/core/v1beta1/openstackversion_types.go

@@ -178,6 +178,7 @@ type ContainerTemplate struct {
 // but are associated with a specific OpenStack release version
 type ServiceDefaults struct {
 	GlanceWsgi *string `json:"glanceWsgi,omitempty"`
+	GlanceLocationAPI *string `json:"glanceLocationAPI,omitempty"`
 }
 
 // OpenStackVersionStatus defines the observed state of OpenStackVersion

api/core/v1beta1/zz_generated.deepcopy.go

@@ -21468,6 +21468,8 @@ spec:
               availableServiceDefaults:
                 additionalProperties:
                   properties:
+                    glanceLocationAPI:
+                      type: string
                     glanceWsgi:
                       type: string
                   type: object
@@ -21903,6 +21905,8 @@ spec:
                 type: integer
               serviceDefaults:
                 properties:
+                  glanceLocationAPI:
+                    type: string
                   glanceWsgi:
                     type: string
                 type: object

bindata/crds/crds.yaml

@@ -248,6 +248,8 @@ spec:
               availableServiceDefaults:
                 additionalProperties:
                   properties:
+                    glanceLocationAPI:
+                      type: string
                     glanceWsgi:
                       type: string
                   type: object
@@ -683,6 +685,8 @@ spec:
                 type: integer
               serviceDefaults:
                 properties:
+                  glanceLocationAPI:
+                    type: string
                   glanceWsgi:
                     type: string
                 type: object

config/crd/bases/core.openstack.org_openstackversions.yaml

@@ -271,6 +271,11 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl
 		} else {
 			glance.GetAnnotations()[glancev1.GlanceWSGILabel] = "false"
 		}
+		if version.Status.ServiceDefaults.GlanceLocationAPI != nil && *version.Status.ServiceDefaults.GlanceLocationAPI == "true" {
+			glance.GetAnnotations()[glancev1.GlanceLocationAPILabel] = "true"
+		} else {
+			glance.GetAnnotations()[glancev1.GlanceLocationAPILabel] = "false"
+		}
 
 		// Append globally defined extraMounts to the service's own list.
 		for _, ev := range instance.Spec.ExtraMounts {

internal/openstack/glance.go

@@ -12,6 +12,7 @@ import (
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
@@ -229,7 +230,8 @@ func InitializeOpenStackVersionServiceDefaults(ctx context.Context) *corev1beta1
 	// but get set to true here for FR3 available versions and thus provide a way for services to migrate
 	// to new deployment topologies
 	trueString := "true"
-	defaults.GlanceWsgi = &trueString // all new glance deployments use WSGI by default (FR3 and later)
+	defaults.GlanceWsgi = &trueString            // all new glance deployments use WSGI by default (FR3 and later)
+	defaults.GlanceLocationAPI = ptr.To("false") // disable location-api for RHOSO 18: this boolean can be switched to true with RHOSO 19 release
 
 	return defaults
 }

internal/openstack/version.go

@@ -3718,8 +3718,8 @@ var _ = Describe("OpenStackOperator Webhook", func() {
 		Expect(errors.As(err, &statusError)).To(BeTrue())
 		Expect(statusError.ErrStatus.Details.Kind).To(Equal("OpenStackControlPlane"))
 		Expect(statusError.ErrStatus.Message).To(
-			ContainSubstring(
-				"Invalid value: \"foo-1234567890-1234567890-1234567890-1234567890-1234567890\": must be no more than 39 characters"),
+			MatchRegexp(
+				"Invalid value: \"foo-1234567890-1234567890-1234567890-1234567890-1234567890\": must be no more than \\d+ characters"),
 		)
 	})
 
@@ -3763,8 +3763,8 @@ var _ = Describe("OpenStackOperator Webhook", func() {
 		Expect(errors.As(err, &statusError)).To(BeTrue())
 		Expect(statusError.ErrStatus.Details.Kind).To(Equal("OpenStackControlPlane"))
 		Expect(statusError.ErrStatus.Message).To(
-			ContainSubstring(
-				"Invalid value: \"foo-1234567890-1234567890-1234567890-1234567890-1234567890\": must be no more than 33 characters"),
+			MatchRegexp(
+				"Invalid value: \"foo-1234567890-1234567890-1234567890-1234567890-1234567890\": must be no more than \\d+ characters"),
 		)
 	})