Skip to content

Commit 514fbc2

Browse files
Weeblinribbybibby
authored andcommitted
Update generate.go on delete comment and make string into const
1 parent 47460d4 commit 514fbc2

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

pkg/permissions/generate.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ type AgentRBACManifests struct {
1919
RoleBindings []rbac.RoleBinding
2020
}
2121

22+
const agentNamespace = "jetstack-secure"
23+
const agentSubjectName = "agent"
24+
2225
//func GenerateAgentRBACManifests(dataGatherers []agent.DataGatherer, konwnNamespaces []string) AgentRBACManifests {
2326
func GenerateAgentRBACManifests(dataGatherers []agent.DataGatherer) AgentRBACManifests {
2427
// create a new AgentRBACManifest struct
@@ -30,9 +33,8 @@ func GenerateAgentRBACManifests(dataGatherers []agent.DataGatherer) AgentRBACMan
3033
}
3134

3235
dyConfig := dg.Config.(*k8s.ConfigDynamic)
33-
metadataName := fmt.Sprintf("jetstack-secure-agent-%s-reader", dyConfig.GroupVersionResource.Resource)
36+
metadataName := fmt.Sprintf("%s-agent-%s-reader", agentNamespace, dyConfig.GroupVersionResource.Resource)
3437

35-
// always do this...
3638
AgentRBACManifests.ClusterRoles = append(AgentRBACManifests.ClusterRoles, rbac.ClusterRole{
3739
TypeMeta: metav1.TypeMeta{
3840
Kind: "ClusterRole",
@@ -52,7 +54,6 @@ func GenerateAgentRBACManifests(dataGatherers []agent.DataGatherer) AgentRBACMan
5254

5355
// if dyConfig.IncludeNamespaces has more than 0 items in it
5456
// then, for each namespace create a rbac.RoleBinding in that namespace
55-
// AgentRBACManifests.RoleBindings = append(...)
5657
if len(dyConfig.IncludeNamespaces) != 0 {
5758
for _, ns := range dyConfig.IncludeNamespaces {
5859
AgentRBACManifests.RoleBindings = append(AgentRBACManifests.RoleBindings, rbac.RoleBinding{
@@ -69,8 +70,8 @@ func GenerateAgentRBACManifests(dataGatherers []agent.DataGatherer) AgentRBACMan
6970
Subjects: []rbac.Subject{
7071
{
7172
Kind: "ServiceAccount",
72-
Name: "agent",
73-
Namespace: "jetstack-secure",
73+
Name: agentSubjectName,
74+
Namespace: agentNamespace,
7475
},
7576
},
7677

@@ -96,8 +97,8 @@ func GenerateAgentRBACManifests(dataGatherers []agent.DataGatherer) AgentRBACMan
9697
Subjects: []rbac.Subject{
9798
{
9899
Kind: "ServiceAccount",
99-
Name: "agent",
100-
Namespace: "jetstack-secure",
100+
Name: agentSubjectName,
101+
Namespace: agentNamespace,
101102
},
102103
},
103104

0 commit comments

Comments
 (0)