Add ServiceDefaults mechanism for updates support

ServiceDefaults is a new feild in the OpenStackVersion status
that can be used to manage service defaults during an update.

Older OpenStackVersions won't have newly initialized defaults set
and thus we treat them as legacy. In the case of glance
they would continue to deploy with httpd+proxypass until
the new OpenStackVersion for FR3 is selected and deployed.

Author: dprince

apis/bases/core.openstack.org_openstackversions.yaml

@@ -638,6 +638,11 @@ spec:
               observedGeneration:
                 format: int64
                 type: integer
+              serviceDefaults:
+                properties:
+                  glanceWsgi:
+                    type: string
+                type: object
             type: object
         type: object
     served: true

apis/core/v1beta1/openstackversion_types.go

@@ -164,6 +164,12 @@ type ContainerTemplate struct {
 	TestAnsibletestImage              *string `json:"testAnsibletestImage,omitempty"`
 }
 
+// ServiceDefaults - struct that contains defaults for OSP services that can change over time
+// but are associated with a specific OpenStack release version
+type ServiceDefaults struct {
+	GlanceWsgi *string `json:"glanceWsgi,omitempty"`
+}
+
 // OpenStackVersionStatus defines the observed state of OpenStackVersion
 type OpenStackVersionStatus struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=status,xDescriptors={"urn:alm:descriptor:io.kubernetes.conditions"}
@@ -179,6 +185,9 @@ type OpenStackVersionStatus struct {
 	// where we keep track of the container images for previous versions
 	ContainerImageVersionDefaults map[string]*ContainerDefaults `json:"containerImageVersionDefaults,omitempty"`
 
+	// ServiceDefaults - struct that contains defaults for OSP services that can change over time
+	ServiceDefaults ServiceDefaults `json:"serviceDefaults,omitempty"`
+
 	//ObservedGeneration - the most recent generation observed for this object.
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }

apis/core/v1beta1/zz_generated.deepcopy.go

@@ -20301,6 +20301,11 @@ spec:
               observedGeneration:
                 format: int64
                 type: integer
+              serviceDefaults:
+                properties:
+                  glanceWsgi:
+                    type: string
+                type: object
             type: object
         type: object
     served: true

bindata/crds/crds.yaml

@@ -638,6 +638,11 @@ spec:
               observedGeneration:
                 format: int64
                 type: integer
+              serviceDefaults:
+                properties:
+                  glanceWsgi:
+                    type: string
+                type: object
             type: object
         type: object
     served: true

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

@@ -190,6 +190,9 @@ func (r *OpenStackVersionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	}
 	// store the defaults for the currently available version
 	instance.Status.ContainerImageVersionDefaults[envAvailableVersion] = defaults
+	// setup per service defaults
+	trueString := "true"
+	instance.Status.ServiceDefaults.GlanceWsgi = &trueString // all new glance deployments are wsgi
 
 	// calculate the container images for the target version
 	Log.Info("Target version: ", "targetVersion", instance.Spec.TargetVersion)

controllers/core/openstackversion_controller.go

@@ -180,6 +180,16 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl
 		if glance.Spec.Storage.StorageClass == "" {
 			glance.Spec.Storage.StorageClass = instance.Spec.StorageClass
 		}
+
+		if glance.GetAnnotations() == nil {
+			glance.SetAnnotations(make(map[string]string))
+		}
+		if version.Status.ServiceDefaults.GlanceWsgi != nil && *version.Status.ServiceDefaults.GlanceWsgi == "true" {
+			glance.GetAnnotations()["glance.openstack.org/wsgi"] = "true"
+		} else {
+			glance.GetAnnotations()["glance.openstack.org/wsgi"] = "false"
+		}
+
 		// Append globally defined extraMounts to the service's own list.
 		for _, ev := range instance.Spec.ExtraMounts {
 			glance.Spec.ExtraMounts = append(glance.Spec.ExtraMounts, glancev1.GlanceExtraVolMounts{