add validation

Signed-off-by: Andreas Gerstmayr <[email protected]>

apis/tempo/v1alpha1/tempomonolithic_webhook.go

@@ -78,15 +78,48 @@ func (tempo *TempoMonolithic) validate() (admission.Warnings, error) {
 	log := ctrl.Log.WithName("tempomonolithic-webhook")
 	log.V(1).Info("running validating webhook", "name", tempo.Name)
 
+	// We do not modify the Kubernetes object in the defaulter webhook,
+	// but still apply some default values in-memory.
+	tempo.Default()
+
 	allWarnings := admission.Warnings{}
 	allErrors := field.ErrorList{}
-
-	if tempo.Spec.ExtraConfig != nil && len(tempo.Spec.ExtraConfig.Tempo.Raw) > 0 {
-		allWarnings = append(allWarnings, "overriding Tempo configuration could potentially break the deployment, use it carefully")
+	addValidation := func(warnings admission.Warnings, errors field.ErrorList) {
+		allWarnings = append(allWarnings, warnings...)
+		allErrors = append(allErrors, errors...)
 	}
 
+	addValidation(tempo.validateStorage())
+	addValidation(tempo.validateExtraConfig())
+
 	if len(allErrors) == 0 {
 		return allWarnings, nil
 	}
 	return allWarnings, apierrors.NewInvalid(tempo.GroupVersionKind().GroupKind(), tempo.Name, allErrors)
 }
+
+func (tempo *TempoMonolithic) validateStorage() (admission.Warnings, field.ErrorList) {
+	storagePath := field.NewPath("spec").Child("storage")
+	if tempo.Spec.Storage == nil {
+		return nil, field.ErrorList{field.Invalid(storagePath, tempo.Spec.Storage, "storage must be configured")}
+	}
+
+	switch tempo.Spec.Storage.Traces.Backend {
+	case MonolithicTracesStorageBackendS3:
+		if tempo.Spec.Storage.Traces.S3 == nil {
+			return nil, field.ErrorList{field.Invalid(storagePath.Child("traces").Child("s3"), tempo.Spec.Storage.Traces.S3, "S3 storage must be configured")}
+		}
+		if tempo.Spec.Storage.Traces.S3.Secret == "" {
+			return nil, field.ErrorList{field.Invalid(storagePath.Child("traces").Child("s3").Child("secret"), tempo.Spec.Storage.Traces.S3.Secret, "S3 storage secret must be configured")}
+		}
+	}
+
+	return nil, nil
+}
+
+func (tempo *TempoMonolithic) validateExtraConfig() (admission.Warnings, field.ErrorList) {
+	if tempo.Spec.ExtraConfig != nil && len(tempo.Spec.ExtraConfig.Tempo.Raw) > 0 {
+		return admission.Warnings{"overriding Tempo configuration could potentially break the deployment, use it carefully"}, nil
+	}
+	return nil, nil
+}

controllers/tempo/tempomonolithic_controller.go

@@ -45,7 +45,7 @@ func (r *TempoMonolithicReconciler) getStorageParams(ctx context.Context, tempo
 	storageParams := manifestutils.StorageParams{}
 	switch tempo.Spec.Storage.Traces.Backend {
 	case v1alpha1.MonolithicTracesStorageBackendMemory, v1alpha1.MonolithicTracesStorageBackendPV:
-		// no action required, return empty storageParams
+		// no action required, return empty StorageParams
 	case v1alpha1.MonolithicTracesStorageBackendS3:
 		if tempo.Spec.Storage.Traces.S3 == nil {
 			return manifestutils.StorageParams{}, fmt.Errorf(".spec.storage.traces.s3 is required")