Skip to content

Commit 0a04458

Browse files
committed
Add replicaset resources by default
Signed-off-by: Israel Blancas <[email protected]>
1 parent c65629b commit 0a04458

File tree

2 files changed

+25
-41
lines changed

2 files changed

+25
-41
lines changed

internal/manifests/collector/parser/processor/processor_k8sattributes.go

+18-22
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,24 @@ func (o *K8sAttributesParser) ParserName() string {
5050
}
5151

5252
func (o *K8sAttributesParser) GetRBACRules() []rbacv1.PolicyRule {
53-
var prs []rbacv1.PolicyRule
54-
55-
// This one needs to be added always
56-
policy := rbacv1.PolicyRule{
57-
APIGroups: []string{""},
58-
Resources: []string{"pods", "namespaces"},
59-
Verbs: []string{"get", "watch", "list"},
53+
// These policies need to be added always
54+
var prs []rbacv1.PolicyRule = []rbacv1.PolicyRule{
55+
{
56+
APIGroups: []string{""},
57+
Resources: []string{"pods", "namespaces"},
58+
Verbs: []string{"get", "watch", "list"},
59+
},
60+
{
61+
APIGroups: []string{"apps"},
62+
Resources: []string{"replicasets"},
63+
Verbs: []string{"get", "watch", "list"},
64+
},
65+
{
66+
APIGroups: []string{"extensions"},
67+
Resources: []string{"replicasets"},
68+
Verbs: []string{"get", "watch", "list"},
69+
},
6070
}
61-
prs = append(prs, policy)
6271

6372
extractCfg, ok := o.config["extract"]
6473
if !ok {
@@ -77,20 +86,7 @@ func (o *K8sAttributesParser) GetRBACRules() []rbacv1.PolicyRule {
7786

7887
for _, m := range metadata {
7988
metadataField := fmt.Sprint(m)
80-
if metadataField == "k8s.deployment.uid" || metadataField == "k8s.deployment.name" {
81-
prs = append(prs,
82-
rbacv1.PolicyRule{
83-
APIGroups: []string{"apps"},
84-
Resources: []string{"replicasets"},
85-
Verbs: []string{"get", "watch", "list"},
86-
},
87-
rbacv1.PolicyRule{
88-
APIGroups: []string{"extensions"},
89-
Resources: []string{"replicasets"},
90-
Verbs: []string{"get", "watch", "list"},
91-
},
92-
)
93-
} else if strings.Contains(metadataField, "k8s.node") {
89+
if strings.Contains(metadataField, "k8s.node") {
9490
prs = append(prs,
9591
rbacv1.PolicyRule{
9692
APIGroups: []string{""},

internal/manifests/collector/parser/processor/processor_k8sattributes_test.go

+7-19
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,6 @@ func TestK8sAttributesRBAC(t *testing.T) {
3434
{
3535
name: "no extra parameters",
3636
config: nil,
37-
expectedRules: []rbacv1.PolicyRule{
38-
{
39-
APIGroups: []string{""},
40-
Resources: []string{"pods", "namespaces"},
41-
Verbs: []string{"get", "watch", "list"},
42-
},
43-
},
44-
},
45-
{
46-
name: "extract k8s.deployment.uid",
47-
config: map[interface{}]interface{}{
48-
"extract": map[interface{}]interface{}{
49-
"metadata": []interface{}{
50-
"k8s.deployment.uid",
51-
},
52-
},
53-
},
5437
expectedRules: []rbacv1.PolicyRule{
5538
{
5639
APIGroups: []string{""},
@@ -70,11 +53,11 @@ func TestK8sAttributesRBAC(t *testing.T) {
7053
},
7154
},
7255
{
73-
name: "extract k8s.deployment.name",
56+
name: "extract k8s.node",
7457
config: map[interface{}]interface{}{
7558
"extract": map[interface{}]interface{}{
7659
"metadata": []interface{}{
77-
"k8s.deployment.name",
60+
"k8s.node",
7861
},
7962
},
8063
},
@@ -94,6 +77,11 @@ func TestK8sAttributesRBAC(t *testing.T) {
9477
Resources: []string{"replicasets"},
9578
Verbs: []string{"get", "watch", "list"},
9679
},
80+
{
81+
APIGroups: []string{""},
82+
Resources: []string{"nodes"},
83+
Verbs: []string{"get", "watch", "list"},
84+
},
9785
},
9886
},
9987
}

0 commit comments

Comments
 (0)