Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release-0.7 back into main. #1005

Merged
merged 6 commits into from
Dec 7, 2023
Merged

Merge release-0.7 back into main. #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
747fcc6
Fix the CRD missing the absent and burnrates booleans
metalmatze Sep 30, 2023
2e9e715
Merge pull request #927 from pyrra-dev/release-0.7-crd-fix
metalmatze Sep 30, 2023
dc7f53e
Run missing `make examples`
metalmatze Oct 4, 2023
875ff1d
Merge pull request #933 from pyrra-dev/release-0.7-generate-examples
metalmatze Oct 4, 2023
7cf76ea
Fix Reconciliation errors when PromRule/ConfigMap doesn't exist
Nov 27, 2023
83b0b8b
Merge pull request #993 from ArthurSens/fix-992
metalmatze Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions examples/kubernetes/manifests-webhook/setup/pyrra-slo-CustomResourceDefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions examples/kubernetes/manifests/setup/pyrra-slo-CustomResourceDefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions examples/openshift/manifests/setup/pyrra-slo-CustomResourceDefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 4 additions & 5 deletions kubernetes/controllers/servicelevelobjective.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down