@@ -17,44 +17,16 @@ limitations under the License.
1717package specs
1818
1919import (
20+ "golang.org/x/exp/slices"
2021 rbacv1 "k8s.io/api/rbac/v1"
2122 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2223
2324 apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
25+ "github.com/cloudnative-pg/cloudnative-pg/pkg/stringset"
2426)
2527
2628// CreateRole create a role with the permissions needed by the instance manager
2729func CreateRole (cluster apiv1.Cluster , backupOrigin * apiv1.Backup ) rbacv1.Role {
28- involvedSecretNames := []string {
29- cluster .GetReplicationSecretName (),
30- cluster .GetClientCASecretName (),
31- cluster .GetServerCASecretName (),
32- cluster .GetServerTLSSecretName (),
33- cluster .GetApplicationSecretName (),
34- cluster .GetSuperuserSecretName (),
35- cluster .GetLDAPSecretName (),
36- }
37-
38- involvedConfigMapNames := []string {
39- cluster .Name ,
40- }
41-
42- if cluster .Spec .Monitoring != nil {
43- // If custom queries are used, the instance manager need privileges to read those
44- // entries
45- for _ , secretName := range cluster .Spec .Monitoring .CustomQueriesSecret {
46- involvedSecretNames = append (involvedSecretNames , secretName .Name )
47- }
48-
49- for _ , configMapName := range cluster .Spec .Monitoring .CustomQueriesConfigMap {
50- involvedConfigMapNames = append (involvedConfigMapNames , configMapName .Name )
51- }
52- }
53-
54- involvedSecretNames = append (involvedSecretNames , backupSecrets (cluster , backupOrigin )... )
55- involvedSecretNames = append (involvedSecretNames , externalClusterSecrets (cluster )... )
56- involvedSecretNames = append (involvedSecretNames , managedRolesSecrets (cluster )... )
57-
5830 rules := []rbacv1.PolicyRule {
5931 {
6032 APIGroups : []string {
@@ -67,7 +39,7 @@ func CreateRole(cluster apiv1.Cluster, backupOrigin *apiv1.Backup) rbacv1.Role {
6739 "get" ,
6840 "watch" ,
6941 },
70- ResourceNames : involvedConfigMapNames ,
42+ ResourceNames : getInvolvedConfigMapNames ( cluster ) ,
7143 },
7244 {
7345 APIGroups : []string {
@@ -80,7 +52,7 @@ func CreateRole(cluster apiv1.Cluster, backupOrigin *apiv1.Backup) rbacv1.Role {
8052 "get" ,
8153 "watch" ,
8254 },
83- ResourceNames : involvedSecretNames ,
55+ ResourceNames : getInvolvedSecretNames ( cluster , backupOrigin ) ,
8456 },
8557 {
8658 APIGroups : []string {
@@ -164,6 +136,55 @@ func CreateRole(cluster apiv1.Cluster, backupOrigin *apiv1.Backup) rbacv1.Role {
164136 }
165137}
166138
139+ func getInvolvedSecretNames (cluster apiv1.Cluster , backupOrigin * apiv1.Backup ) []string {
140+ involvedSecretNames := []string {
141+ cluster .GetReplicationSecretName (),
142+ cluster .GetClientCASecretName (),
143+ cluster .GetServerCASecretName (),
144+ cluster .GetServerTLSSecretName (),
145+ cluster .GetApplicationSecretName (),
146+ cluster .GetSuperuserSecretName (),
147+ cluster .GetLDAPSecretName (),
148+ }
149+
150+ if cluster .Spec .Monitoring != nil {
151+ for _ , secretName := range cluster .Spec .Monitoring .CustomQueriesSecret {
152+ involvedSecretNames = append (involvedSecretNames , secretName .Name )
153+ }
154+ }
155+
156+ involvedSecretNames = append (involvedSecretNames , backupSecrets (cluster , backupOrigin )... )
157+ involvedSecretNames = append (involvedSecretNames , externalClusterSecrets (cluster )... )
158+ involvedSecretNames = append (involvedSecretNames , managedRolesSecrets (cluster )... )
159+
160+ return cleanupResourceList (involvedSecretNames )
161+ }
162+
163+ func getInvolvedConfigMapNames (cluster apiv1.Cluster ) []string {
164+ involvedConfigMapNames := []string {
165+ cluster .Name ,
166+ }
167+
168+ if cluster .Spec .Monitoring != nil {
169+ // If custom queries are used, the instance manager need privileges to read those
170+ // entries
171+ for _ , configMapName := range cluster .Spec .Monitoring .CustomQueriesConfigMap {
172+ involvedConfigMapNames = append (involvedConfigMapNames , configMapName .Name )
173+ }
174+ }
175+
176+ return cleanupResourceList (involvedConfigMapNames )
177+ }
178+
179+ // cleanupResourceList returns a new list with the same elements as resourceList, where
180+ // the empty and duplicate entries have been removed
181+ func cleanupResourceList (resourceList []string ) []string {
182+ result := stringset .From (resourceList ).ToSortedList ()
183+ return slices .DeleteFunc (result , func (s string ) bool {
184+ return len (s ) == 0
185+ })
186+ }
187+
167188func externalClusterSecrets (cluster apiv1.Cluster ) []string {
168189 var result []string
169190
0 commit comments