Merge pull request #1876 from fmount/sharev1

Set ManilaShareV1 annotation via OpenStackVersion

Author: openshift-merge-bot[bot]

api/bases/core.openstack.org_openstackversions.yaml

@@ -252,6 +252,8 @@ spec:
                       type: string
                     glanceWsgi:
                       type: string
+                    manilaSharev1:
+                      type: string
                     rabbitmqVersion:
                       type: string
                   type: object
@@ -691,6 +693,8 @@ spec:
                     type: string
                   glanceWsgi:
                     type: string
+                  manilaSharev1:
+                    type: string
                   rabbitmqVersion:
                     type: string
                 type: object

api/core/v1beta1/openstackversion_types.go

@@ -180,6 +180,7 @@ type ServiceDefaults struct {
 	GlanceWsgi      *string `json:"glanceWsgi,omitempty"`
 	RabbitmqVersion *string `json:"rabbitmqVersion,omitempty"`
 	GlanceLocationAPI *string `json:"glanceLocationAPI,omitempty"`
+	ManilaSharev1   *string `json:"manilaSharev1,omitempty"`
 }
 
 // OpenStackVersionStatus defines the observed state of OpenStackVersion

api/core/v1beta1/zz_generated.deepcopy.go

@@ -21478,6 +21478,8 @@ spec:
                       type: string
                     glanceWsgi:
                       type: string
+                    manilaSharev1:
+                      type: string
                     rabbitmqVersion:
                       type: string
                   type: object
@@ -21917,6 +21919,8 @@ spec:
                     type: string
                   glanceWsgi:
                     type: string
+                  manilaSharev1:
+                    type: string
                   rabbitmqVersion:
                     type: string
                 type: object

bindata/crds/crds.yaml

@@ -252,6 +252,8 @@ spec:
                       type: string
                     glanceWsgi:
                       type: string
+                    manilaSharev1:
+                      type: string
                     rabbitmqVersion:
                       type: string
                   type: object
@@ -691,6 +693,8 @@ spec:
                     type: string
                   glanceWsgi:
                     type: string
+                  manilaSharev1:
+                    type: string
                   rabbitmqVersion:
                     type: string
                 type: object

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

@@ -216,6 +216,14 @@ func ReconcileManila(ctx context.Context, instance *corev1beta1.OpenStackControl
 			//manila.Spec.DatabaseInstance = instance.Name // name of MariaDB we create here
 			manila.Spec.DatabaseInstance = "openstack" //FIXME: see above
 		}
+		if manila.GetAnnotations() == nil {
+			manila.SetAnnotations(make(map[string]string))
+		}
+		if version.Status.ServiceDefaults.ManilaSharev1 != nil && *version.Status.ServiceDefaults.ManilaSharev1 == "true" {
+			manila.GetAnnotations()[manilav1.ManilaShareV1Label] = "true"
+		} else {
+			manila.GetAnnotations()[manilav1.ManilaShareV1Label] = "false"
+		}
 		// Append globally defined extraMounts to the service's own list.
 		for _, ev := range instance.Spec.ExtraMounts {
 			manila.Spec.ExtraMounts = append(manila.Spec.ExtraMounts, manilav1.ManilaExtraVolMounts{

internal/openstack/manila.go

@@ -232,6 +232,9 @@ func InitializeOpenStackVersionServiceDefaults(ctx context.Context) *corev1beta1
 	trueString := "true"
 	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
+	// NOTE: In 18 Manila creates sharev1 service and endpoints. From 19 do not create sharev1 anymore
+	// https://review.opendev.org/q/topic:%22remove-v1%22+and+project:openstack/manila
+	defaults.ManilaSharev1 = &trueString // all Manila deployments create sharev1 endpoints by default
 
 	versionString := "4.2"
 	defaults.RabbitmqVersion = &versionString // all new rabbitmq deployments will have rabbitmq-server 4.2 (FR5)