change the order or configmap name and namespace name (#347)

qpdpQ · web-flow · commit 84d7cfe9eba9 · 2024-11-20T23:28:19.000+08:00
Signed-off-by: Allen Li &lt;liyuchen223@gmail.com&gt;
diff --git a/controllers/namespacescope_controller.go b/controllers/namespacescope_controller.go
@@ -552,7 +552,8 @@ func (r *NamespaceScopeReconciler) GetRolesFromNamespace(ctx context.Context, in
 
 	roles := []rbacv1.Role{}
 	for _, role := range rolesList.Items {
-		if value, ok := role.Labels[constant.NamespaceScopeConfigmapLabelKey]; ok && value == instance.Namespace+"-"+instance.Spec.ConfigmapName {
+		configmapValue := util.GetFirstNCharacter(instance.Spec.ConfigmapName+"-"+instance.Namespace, 63)
+		if value, ok := role.Labels[constant.NamespaceScopeConfigmapLabelKey]; ok && value == configmapValue {
 			roles = append(roles, role)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,8 @@ func (r *NamespaceScopeReconciler) GetRolesFromNamespace(ctx context.Context, in`
`552`	`552`
`553`	`553`	`roles := []rbacv1.Role{}`
`554`	`554`	`for _, role := range rolesList.Items {`
`555`		`- if value, ok := role.Labels[constant.NamespaceScopeConfigmapLabelKey]; ok && value == instance.Namespace+"-"+instance.Spec.ConfigmapName {`
	`555`	`+ configmapValue := util.GetFirstNCharacter(instance.Spec.ConfigmapName+"-"+instance.Namespace, 63)`
	`556`	`+ if value, ok := role.Labels[constant.NamespaceScopeConfigmapLabelKey]; ok && value == configmapValue {`
`556`	`557`	`roles = append(roles, role)`
`557`	`558`	`}`
`558`	`559`	`}`