Skip to content

Commit ca62382

Browse files
authored
CP-30042: allow resource_type and workload labels in Gator (#315)
1 parent d83273c commit ca62382

5 files changed

Lines changed: 15 additions & 0 deletions

File tree

helm/docs/releases/1.2.2.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ This is a maintenance release that includes important bug fixes and dependency u
88
- **ConfigMap References**: Updated ConfigMap name references in the loader job to use the correct naming convention, preventing resource lookup failures.
99
- **JSON Schema Validation**: Added support for properties which were previously not present in `values.yaml`, but were used in the template.
1010
- **Invalid Template Fixes**: Fixed template generation for options were causing invalid Kubernetes resources to be generated.
11+
- **Allow resource_type Labels**: The Aggregator no longer filters out "resource_type" and "workload" labels.
1112

1213
### Enhancements
1314

helm/templates/_defaults.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,10 @@ metricFilters:
171171
- product_name
172172
- provider_id
173173
- resource
174+
- resource_type
174175
- unit
175176
- uid
177+
- workload
176178
prefix:
177179
- "_"
178180
- "label_"

tests/helm/template/cert-manager.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,10 +405,14 @@ data:
405405
match: exact
406406
- pattern: "resource"
407407
match: exact
408+
- pattern: "resource_type"
409+
match: exact
408410
- pattern: "unit"
409411
match: exact
410412
- pattern: "uid"
411413
match: exact
414+
- pattern: "workload"
415+
match: exact
412416
- pattern: "_"
413417
match: prefix
414418
- pattern: "label_"

tests/helm/template/federated.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,14 @@ data:
474474
match: exact
475475
- pattern: "resource"
476476
match: exact
477+
- pattern: "resource_type"
478+
match: exact
477479
- pattern: "unit"
478480
match: exact
479481
- pattern: "uid"
480482
match: exact
483+
- pattern: "workload"
484+
match: exact
481485
- pattern: "_"
482486
match: prefix
483487
- pattern: "label_"

tests/helm/template/manifest.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,14 @@ data:
421421
match: exact
422422
- pattern: "resource"
423423
match: exact
424+
- pattern: "resource_type"
425+
match: exact
424426
- pattern: "unit"
425427
match: exact
426428
- pattern: "uid"
427429
match: exact
430+
- pattern: "workload"
431+
match: exact
428432
- pattern: "_"
429433
match: prefix
430434
- pattern: "label_"

0 commit comments

Comments
 (0)