Merge pull request #468 from vyzigold/ephemeral

[OSPRH-9252] Support for ephemeral metric storage

Author: openshift-merge-bot[bot]

api/bases/telemetry.openstack.org_metricstorages.yaml

@@ -1169,10 +1169,11 @@ spec:
                         type: string
                       strategy:
                         default: persistent
-                        description: Strategy to use for storage. Can be "persistent"
-                          or empty, in which case a COO default is used
+                        description: Strategy to use for storage. Can be "persistent",
+                          "ephemeral" or empty, in which case a COO default is used
                         enum:
                         - persistent
+                        - ephemeral
                         type: string
                     type: object
                 type: object

api/bases/telemetry.openstack.org_telemetries.yaml

@@ -1728,10 +1728,12 @@ spec:
                             type: string
                           strategy:
                             default: persistent
-                            description: Strategy to use for storage. Can be "persistent"
-                              or empty, in which case a COO default is used
+                            description: Strategy to use for storage. Can be "persistent",
+                              "ephemeral" or empty, in which case a COO default is
+                              used
                             enum:
                             - persistent
+                            - ephemeral
                             type: string
                         type: object
                     type: object

api/v1beta1/metricstorage_types.go

@@ -42,10 +42,10 @@ type PersistentStorage struct {
 
 // Storage defines the options used for storage of metrics
 type Storage struct {
-	// Strategy to use for storage. Can be "persistent"
+	// Strategy to use for storage. Can be "persistent", "ephemeral"
 	// or empty, in which case a COO default is used
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:validation:Enum=persistent
+	// +kubebuilder:validation:Enum=persistent;ephemeral
 	// +kubebuilder:default=persistent
 	Strategy string `json:"strategy"`
 
@@ -57,7 +57,7 @@ type Storage struct {
 	// Used to specify the options of persistent storage when
 	// strategy = "persistent"
 	// +kubebuilder:validation:Optional
-	Persistent PersistentStorage `json:"persistent"`
+	Persistent *PersistentStorage `json:"persistent,omitempty"`
 }
 
 // MonitoringStack defines the options for a Red Hat supported metric storage

api/v1beta1/metricstorage_webhook.go

@@ -81,7 +81,10 @@ func (storage *Storage) Default() {
 		storage.Retention = "24h"
 	}
 	if storage.Strategy == "persistent" {
+		storage.Persistent = &PersistentStorage{}
 		storage.Persistent.Default()
+	} else {
+		storage.Persistent = nil
 	}
 }
 

api/v1beta1/zz_generated.deepcopy.go

@@ -1169,10 +1169,11 @@ spec:
                         type: string
                       strategy:
                         default: persistent
-                        description: Strategy to use for storage. Can be "persistent"
-                          or empty, in which case a COO default is used
+                        description: Strategy to use for storage. Can be "persistent",
+                          "ephemeral" or empty, in which case a COO default is used
                         enum:
                         - persistent
+                        - ephemeral
                         type: string
                     type: object
                 type: object

config/crd/bases/telemetry.openstack.org_metricstorages.yaml

@@ -1728,10 +1728,12 @@ spec:
                             type: string
                           strategy:
                             default: persistent
-                            description: Strategy to use for storage. Can be "persistent"
-                              or empty, in which case a COO default is used
+                            description: Strategy to use for storage. Can be "persistent",
+                              "ephemeral" or empty, in which case a COO default is
+                              used
                             enum:
                             - persistent
+                            - ephemeral
                             type: string
                         type: object
                     type: object

config/crd/bases/telemetry.openstack.org_telemetries.yaml

@@ -40,6 +40,7 @@ func MonitoringStack(
 	if err != nil {
 		return nil, err
 	}
+	scrapeInterval := monv1.Duration(instance.Spec.MonitoringStack.ScrapeInterval)
 	monitoringStack := &obov1.MonitoringStack{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      instance.Name,
@@ -51,10 +52,8 @@ func MonitoringStack(
 				Disabled: !instance.Spec.MonitoringStack.AlertingEnabled,
 			},
 			PrometheusConfig: &obov1.PrometheusConfig{
-				Replicas: &telemetryv1.PrometheusReplicas,
-				// NOTE: unsupported before OBOv0.0.21, but we can set the value
-				//       in the ServiceMonitor, so this isn't a big deal.
-				//ScrapeInterval: instance.Spec.MonitoringStack.ScrapeInterval,
+				Replicas:              &telemetryv1.PrometheusReplicas,
+				ScrapeInterval:        &scrapeInterval,
 				PersistentVolumeClaim: pvc,
 			},
 			Retention: monv1.Duration(instance.Spec.MonitoringStack.Storage.Retention),
@@ -68,7 +67,10 @@ func MonitoringStack(
 
 func getPVCSpec(instance *telemetryv1.MetricStorage) (*corev1.PersistentVolumeClaimSpec, error) {
 	if instance.Spec.MonitoringStack.Storage.Strategy == "persistent" {
-		persistentSpec := &instance.Spec.MonitoringStack.Storage.Persistent
+		persistentSpec := instance.Spec.MonitoringStack.Storage.Persistent
+		if persistentSpec == nil {
+			return nil, fmt.Errorf("Received a nil value in persistent storage config")
+		}
 		pvc := corev1.PersistentVolumeClaimSpec{}
 		if !reflect.DeepEqual(persistentSpec.PvcStorageSelector, metav1.LabelSelector{}) {
 			pvc.Selector = &persistentSpec.PvcStorageSelector