Merge branch 'qosclass' into 'master'

Add QoSClass to CRD

See merge request !25

api/v1alpha1/drupalsite_types.go

@@ -22,6 +22,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	QoSStandard  QoSClass  = "standard"
+	DBODStandard DBODClass = "standard"
+	DBODSSD      DBODClass = "ssd"
+)
+
 // DrupalSiteSpec defines the desired state of DrupalSite
 type DrupalSiteSpec struct {
 	// Publish defines if the site has to be published or not
@@ -59,8 +65,20 @@ type Environment struct {
 	// ImageOverride overrides the image urls in the DrupalSite deployment for the fields that are set
 	// +optional
 	ImageOverride `json:"imageOverride,omitempty"`
+	// QoSClass specifies the website's performance and availability requirements
+	// +optional
+	QoSClass `json:"qosClass,omitempty"`
+	// DBODClass requests a specific kind of DBOD resources for the website. If omitted, it is derived from QoSClass.
+	// +optional
+	DBODClass `json:"dbodClass,omitempty"`
 }
 
+// QoSClass specifies the website's performance and availability requirements
+type QoSClass string
+
+// DBODClass requests a specific kind of DBOD resources for the website. If omitted, it is derived from QoSClass.
+type DBODClass string
+
 // ImageOverride lets the website admin bypass the operator's buildconfigs and inject custom images.
 // Envisioned primarily for the sitebuilder, this could allow an advanced developer to deploy their own
 // custom version of Drupal or different PHP versions.

config/crd/bases/drupal.webservices.cern.ch_drupalsites.yaml

@@ -49,6 +49,10 @@ spec:
               environment:
                 description: Environment defines the drupal site environments
                 properties:
+                  dbodClass:
+                    description: DBODClass requests a specific kind of DBOD resources
+                      for the website. If omitted, it is derived from QoSClass.
+                    type: string
                   extraConfigRepo:
                     description: 'ExtraConfigRepo passes on the git url with advanced
                       configuration to the DrupalSite S2I functionality TODO: support
@@ -70,6 +74,10 @@ spec:
                       The name will be used for resource lables and route name
                     pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?'
                     type: string
+                  qosClass:
+                    description: QoSClass specifies the website's performance and
+                      availability requirements
+                    type: string
                 required:
                 - name
                 type: object