add missing label check when looking for missing admin CRBs

m00g3n · Aug 14, 2024 · 0ef59b3 · 0ef59b3
1 parent e0c541d
commit 0ef59b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/api/v1/runtime_types.go b/api/v1/runtime_types.go
@@ -279,13 +279,6 @@ func (k *Runtime) IsConditionSetWithStatus(c RuntimeConditionType, r RuntimeCond
 	return false
 }
 
-func (k *Runtime) IsConditionConfiguredSuccess() bool {
-	return k.IsConditionSetWithStatus(
-		ConditionTypeRuntimeConfigured,
-		ConditionReasonShootCreationCompleted,
-		metav1.ConditionTrue)
-}
-
 func (k *Runtime) ValidateRequiredLabels() error {
 	var requiredLabelKeys = []string{
 		LabelKymaInstanceID,

diff --git a/internal/controller/runtime/fsm/runtime_fsm_apply_clusterrolebindings.go b/internal/controller/runtime/fsm/runtime_fsm_apply_clusterrolebindings.go
@@ -115,9 +115,12 @@ func getRemoved(crbs []rbacv1.ClusterRoleBinding, admins []string) (removed []rb
 
 //nolint:gochecknoglobals
 var newContainsAdmin = func(admin string) func(rbacv1.ClusterRoleBinding) bool {
-	return func(r rbacv1.ClusterRoleBinding) bool {
+	return func(crb rbacv1.ClusterRoleBinding) bool {
+		if !labels.Set(crb.Labels).AsSelector().Matches(labels.Set(labelsClusterRoleBindings)) {
+			return false
+		}
 		isAdmin := isRBACUserKindOneOf([]string{admin})
-		return slices.ContainsFunc(r.Subjects, isAdmin)
+		return slices.ContainsFunc(crb.Subjects, isAdmin)
 	}
 }