Merge pull request #1005 from pyrra-dev/release-0.7

pyrra-dev · Dec 7, 2023 · 3bd8d74 · 3bd8d74
2 parents 4941165 + 83b0b8b
commit 3bd8d74
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/examples/kubernetes/manifests-webhook/setup/pyrra-slo-CustomResourceDefinition.yaml b/examples/kubernetes/manifests-webhook/setup/pyrra-slo-CustomResourceDefinition.yaml
@@ -48,6 +48,12 @@ spec:
               alerting:
                 description: Alerting customizes the alerting rules generated by Pyrra.
                 properties:
+                  absent:
+                    default: true
+                    type: boolean
+                  burnrates:
+                    default: true
+                    type: boolean
                   disabled:
                     description: Disabled is used to disable the generation of alerts. Recording rules are still generated.
                     type: boolean

diff --git a/examples/kubernetes/manifests/setup/pyrra-slo-CustomResourceDefinition.yaml b/examples/kubernetes/manifests/setup/pyrra-slo-CustomResourceDefinition.yaml
@@ -48,6 +48,12 @@ spec:
               alerting:
                 description: Alerting customizes the alerting rules generated by Pyrra.
                 properties:
+                  absent:
+                    default: true
+                    type: boolean
+                  burnrates:
+                    default: true
+                    type: boolean
                   disabled:
                     description: Disabled is used to disable the generation of alerts. Recording rules are still generated.
                     type: boolean

diff --git a/examples/openshift/manifests/setup/pyrra-slo-CustomResourceDefinition.yaml b/examples/openshift/manifests/setup/pyrra-slo-CustomResourceDefinition.yaml
@@ -48,6 +48,12 @@ spec:
               alerting:
                 description: Alerting customizes the alerting rules generated by Pyrra.
                 properties:
+                  absent:
+                    default: true
+                    type: boolean
+                  burnrates:
+                    default: true
+                    type: boolean
                   disabled:
                     description: Disabled is used to disable the generation of alerts. Recording rules are still generated.
                     type: boolean

diff --git a/jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json b/jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json
@@ -66,6 +66,14 @@
                   "alerting": {
                     "description": "Alerting customizes the alerting rules generated by Pyrra.",
                     "properties": {
+                      "absent": {
+                        "default": true,
+                        "type": "boolean"
+                      },
+                      "burnrates": {
+                        "default": true,
+                        "type": "boolean"
+                      },
                       "disabled": {
                         "description": "Disabled is used to disable the generation of alerts. Recording rules are still generated.",
                         "type": "boolean"

diff --git a/kubernetes/controllers/servicelevelobjective.go b/kubernetes/controllers/servicelevelobjective.go
@@ -79,10 +79,9 @@ func (r *ServiceLevelObjectiveReconciler) reconcilePrometheusRule(ctx context.Co
 			if err := r.Create(ctx, newRule); err != nil {
 				return ctrl.Result{}, err
 			}
-			return ctrl.Result{}, fmt.Errorf("failed to create prometheus rule: %w", err)
+		} else {
+			return ctrl.Result{}, fmt.Errorf("failed to get prometheus rule: %w", err)
 		}
-
-		return ctrl.Result{}, fmt.Errorf("failed to get prometheus rule: %w", err)
 	}
 
 	newRule.ResourceVersion = rule.ResourceVersion
@@ -123,9 +122,9 @@ func (r *ServiceLevelObjectiveReconciler) reconcileConfigMap(
 			if err := r.Create(ctx, newConfigMap); err != nil {
 				return ctrl.Result{}, fmt.Errorf("failed to create config map: %w", err)
 			}
+		} else {
+			return ctrl.Result{}, fmt.Errorf("failed to get config map: %w", err)
 		}
-
-		return ctrl.Result{}, err
 	}
 
 	newConfigMap.ResourceVersion = existingConfigMap.ResourceVersion