Merge branch 'main' into PC-14236-le-1-shr-thresholds

nobl9 · Sep 20, 2024 · be63493 · be63493
2 parents 7a75bf2 + 0350ad4
commit be63493
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/internal/manifest/v1alpha/examples/slo_composite.go b/internal/manifest/v1alpha/examples/slo_composite.go
@@ -74,7 +74,6 @@ func (s sloCompositeExample) SLO() v1alphaSLO.SLO {
 				{
 					ObjectiveBase: v1alphaSLO.ObjectiveBase{
 						DisplayName: "User experience",
-						Value:       ptr(0.0),
 						Name:        "user-experience",
 					},
 					BudgetTarget:    ptr(0.95),

diff --git a/manifest/v1alpha/slo/examples/composite-slo.yaml b/manifest/v1alpha/slo/examples/composite-slo.yaml
@@ -29,7 +29,6 @@
     budgetingMethod: Occurrences
     objectives:
     - displayName: User experience
-      value: 0.0
       name: user-experience
       target: 0.95
       composite:
@@ -96,7 +95,6 @@
     budgetingMethod: Occurrences
     objectives:
     - displayName: User experience
-      value: 0.0
       name: user-experience
       target: 0.95
       composite:
@@ -160,7 +158,6 @@
     budgetingMethod: Timeslices
     objectives:
     - displayName: User experience
-      value: 0.0
       name: user-experience
       target: 0.95
       timeSliceTarget: 0.9
@@ -228,7 +225,6 @@
     budgetingMethod: Timeslices
     objectives:
     - displayName: User experience
-      value: 0.0
       name: user-experience
       target: 0.95
       timeSliceTarget: 0.9

diff --git a/manifest/v1alpha/slo/slo.go b/manifest/v1alpha/slo/slo.go
@@ -68,7 +68,7 @@ type Attachment struct {
 // ObjectiveBase base structure representing an objective.
 type ObjectiveBase struct {
 	DisplayName string   `json:"displayName"`
-	Value       *float64 `json:"value"`
+	Value       *float64 `json:"value,omitempty"`
 	Name        string   `json:"name"`
 	NameChanged bool     `json:"-"`
 }

diff --git a/sdk/test_data/reader/expected/composite_v2_slo.tpl.json b/sdk/test_data/reader/expected/composite_v2_slo.tpl.json
@@ -12,7 +12,6 @@
     "objectives": [
       {
         "displayName": "composite-obj",
-        "value": null,
         "name": "composite-obj",
         "target": 0.99,
         "composite": {