Skip to content

Commit 8c15d26

Browse files
committed
Fix labels
Signed-off-by: Israel Blancas <[email protected]>
1 parent 452f02f commit 8c15d26

File tree

1 file changed

+17
-7
lines changed
  • internal/manifests/collector

1 file changed

+17
-7
lines changed

internal/manifests/collector/rbac.go

+17-7
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,19 @@ func Role(params manifests.Params) ([]client.Object, error) {
9797
return nil, err
9898
}
9999

100+
name := naming.Role(params.OtelCol.Name, params.OtelCol.Namespace)
101+
102+
labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, params.Config.LabelsFilter())
103+
annotations, err := manifestutils.Annotations(params.OtelCol, params.Config.AnnotationsFilter())
104+
if err != nil {
105+
return nil, err
106+
}
107+
100108
// Convert []*rbacv1.Role to []client.Object
101109
result := make([]client.Object, len(roles))
102110
for i, role := range roles {
111+
role.ObjectMeta.Labels = labels
112+
role.ObjectMeta.Annotations = annotations
103113
result[i] = role
104114
}
105115

@@ -114,20 +124,20 @@ func RoleBinding(params manifests.Params) ([]client.Object, error) {
114124
return nil, nil
115125
}
116126

127+
name := naming.RoleBinding(params.OtelCol.Name, params.OtelCol.Namespace)
128+
129+
labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, params.Config.LabelsFilter())
117130
annotations, err := manifestutils.Annotations(params.OtelCol, params.Config.AnnotationsFilter())
118131
if err != nil {
119132
return nil, err
120133
}
121134

122-
for _, rb := range rbs {
123-
rb.ObjectMeta.Labels = manifestutils.Labels(params.OtelCol.ObjectMeta, rb.ObjectMeta.Name, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, params.Config.LabelsFilter())
124-
rb.ObjectMeta.Annotations = annotations
125-
}
126-
127135
// Convert []*rbacv1.RoleBinding to []client.Object
128136
result := make([]client.Object, len(rbs))
129-
for i, role := range rbs {
130-
result[i] = role
137+
for i, rb := range rbs {
138+
rb.ObjectMeta.Labels = labels
139+
rb.ObjectMeta.Annotations = annotations
140+
result[i] = rb
131141
}
132142

133143
return result, nil

0 commit comments

Comments
 (0)