Skip to content

Commit 1d3257e

Browse files
committed
multi-shard support for terminators
On-behalf-of: SAP <[email protected]> Signed-off-by: Simon Bein <[email protected]>
1 parent 7acf553 commit 1d3257e

File tree

3 files changed

+352
-144
lines changed

3 files changed

+352
-144
lines changed

pkg/reconciler/tenancy/replicateclusterrole/replicateclusterrole_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func HasUseRule(clusterName logicalcluster.Name, cr *rbacv1.ClusterRole) bool {
5757
}
5858
resources := sets.New[string](rule.Resources...)
5959
verbs := sets.New[string](rule.Verbs...)
60-
if (resources.Has("workspacetypes") || resources.Has("*")) && (verbs.Has("use") || verbs.Has("initialize") || verbs.Has("*")) {
60+
if (resources.Has("workspacetypes") || resources.Has("*")) && (verbs.Has("use") || verbs.Has("initialize") || verbs.Has("terminate") || verbs.Has("*")) {
6161
return true
6262
}
6363
}

pkg/reconciler/tenancy/workspace/workspace_reconcile_phase.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ func (r *phaseReconciler) reconcile(ctx context.Context, workspace *tenancyv1alp
6060
return reconcileStatusContinue, nil
6161
}
6262

63+
// set terminators during initializiation, as we want to show them to the user already
64+
workspace.Status.Terminators = logicalCluster.Status.Terminators
65+
6366
workspace.Status.Initializers = logicalCluster.Status.Initializers
6467

6568
if initializers := workspace.Status.Initializers; len(initializers) > 0 {

0 commit comments

Comments
 (0)