Skip to content

Commit 758f267

Browse files
gardener-ci-robotvpnachev
authored andcommitted
Ensure already migrated CRBs are not duplicated in the gardeneraccess MR (gardener#13310)
Co-authored-by: vpnachev <vladimir.nachev@sap.com> (cherry picked from commit 9002f97)
1 parent 6618802 commit 758f267

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

cmd/gardenlet/app/migration.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ func migrateAdminViewerKubeconfigClusterRoleBindings(ctx context.Context, log lo
117117
return fmt.Errorf("failed to get objects for ManagedResource %q: %w", gardenerAccessKey, err)
118118
}
119119

120+
gardenerAccessObjects = slices.DeleteFunc(gardenerAccessObjects, func(obj client.Object) bool {
121+
return slices.Contains(crbs, obj.GetName())
122+
})
123+
120124
gardenerAccessObjects = append(gardenerAccessObjects, gardeneraccess.ShootAccessClusterRoleBindings()...)
121125
gardenerAccessRegistry := managedresources.NewRegistry(kubernetes.ShootScheme, kubernetes.ShootCodec, kubernetes.ShootSerializer)
122126
gardenerAccessResources, err := gardenerAccessRegistry.AddAllAndSerialize(gardenerAccessObjects...)

0 commit comments

Comments
 (0)