Skip to content

Commit 39ce1d3

Browse files
fix: git integration cm reporting (#374)
* fix: git integration cm reporting * Update changelog --------- Co-authored-by: Oleksandr Saulyak <[email protected]>
1 parent 715a1ad commit 39ce1d3

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

changelog/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
### Features
2-
- feat(event-reporter): using sources-server for getting application version
2+
- feat(event-reporter): allow git integration ConfigMap reporting

event_reporter/reporter/resource_utils.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ var allowedResourceTypes = map[ResourceTypeKey]bool{
5252
}
5353

5454
const (
55-
CODEFRESH_IO_ENTITY = "codefresh_io_entity"
56-
CODEFRESH_CM_NAME = "codefresh-cm"
55+
CODEFRESH_IO_ENTITY = "codefresh.io/entity"
56+
CODEFRESH_IO_ENTITY_ALT = "codefresh_io_entity"
57+
CODEFRESH_CM_NAME = "codefresh-cm"
5758
)
5859

5960
func isAllowedResource(rs appv1.ResourceStatus) bool {
@@ -77,8 +78,13 @@ func isAllowedConfigMap(manifest string) bool {
7778
return true
7879
}
7980

80-
// Check for the codefresh_io_entity label
81+
// Check for both possible Codefresh entity label formats
8182
labels := u.GetLabels()
82-
_, hasCodefreshEntityLabel := labels[CODEFRESH_IO_ENTITY]
83-
return labels != nil && hasCodefreshEntityLabel
83+
if labels == nil {
84+
return false
85+
}
86+
87+
_, hasUnderscoreLabel := labels[CODEFRESH_IO_ENTITY]
88+
_, hasDotLabel := labels[CODEFRESH_IO_ENTITY_ALT]
89+
return hasUnderscoreLabel || hasDotLabel
8490
}

0 commit comments

Comments
 (0)