internal/pkg/scaffold/helm/role.go: add custom rules for namespaced scope (#1456) (#1466)

joelanford · web-flow · commit cffb948c6964 · 2019-05-21T16:46:30.000-04:00
diff --git a/internal/pkg/scaffold/helm/role.go b/internal/pkg/scaffold/helm/role.go
@@ -76,8 +76,8 @@ func CreateRoleScaffold(cfg *rest.Config, chart *chart.Chart) (*scaffold.Role, e
 	if len(clusterResourceRules) > 0 {
 		log.Info("Scaffolding ClusterRole and ClusterRolebinding for cluster scoped resources in the helm chart")
 		roleScaffold.IsClusterScoped = true
-		roleScaffold.CustomRules = append(roleScaffold.CustomRules, append(clusterResourceRules, namespacedResourceRules...)...)
 	}
+	roleScaffold.CustomRules = append(roleScaffold.CustomRules, append(clusterResourceRules, namespacedResourceRules...)...)
 
 	log.Warn("The RBAC rules generated in deploy/role.yaml are based on the chart's default manifest." +
 		" Some rules may be missing for resources that are only enabled with custom values, and" +

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ func CreateRoleScaffold(cfg rest.Config, chart chart.Chart) (*scaffold.Role, e`
`76`	`76`	`if len(clusterResourceRules) > 0 {`
`77`	`77`	`log.Info("Scaffolding ClusterRole and ClusterRolebinding for cluster scoped resources in the helm chart")`
`78`	`78`	`roleScaffold.IsClusterScoped = true`
`79`		`- roleScaffold.CustomRules = append(roleScaffold.CustomRules, append(clusterResourceRules, namespacedResourceRules...)...)`
`80`	`79`	`}`
	`80`	`+ roleScaffold.CustomRules = append(roleScaffold.CustomRules, append(clusterResourceRules, namespacedResourceRules...)...)`
`81`	`81`
`82`	`82`	`log.Warn("The RBAC rules generated in deploy/role.yaml are based on the chart's default manifest." +`
`83`	`83`	`" Some rules may be missing for resources that are only enabled with custom values, and" +`