Skip to content

Commit 312609a

Browse files
committed
Revert "refactor: allow for generation of multiple virtual workspace urls"
This reverts commit 623580d.
1 parent 9cd547f commit 312609a

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,26 @@ func (c *controller) updateVirtualWorkspaceURLs(ctx context.Context, wt *tenancy
6666
continue
6767
}
6868

69-
// generate URLs for initializing workspaces
70-
for _, virtualWorkspaceName := range []string{initializingworkspaces.VirtualWorkspaceName} {
71-
u, err := url.Parse(shard.Spec.VirtualWorkspaceURL)
72-
if err != nil {
73-
// Should never happen
74-
logger.Error(err, "error parsing shard.spec.virtualWorkspaceURL", "virtualWorkspaceURL", shard.Spec.VirtualWorkspaceURL)
75-
continue
76-
}
77-
78-
u.Path = path.Join(
79-
u.Path,
80-
virtualworkspacesoptions.DefaultRootPathPrefix,
81-
virtualWorkspaceName,
82-
string(initialization.InitializerForType(wt)),
83-
)
84-
85-
desiredURLs.Insert(u.String())
69+
u, err := url.Parse(shard.Spec.VirtualWorkspaceURL)
70+
if err != nil {
71+
// Should never happen
72+
logger.Error(err, "error parsing shard.spec.virtualWorkspaceURL", "virtualWorkspaceURL", shard.Spec.VirtualWorkspaceURL)
73+
continue
8674
}
8775

88-
wt.Status.VirtualWorkspaces = nil
76+
u.Path = path.Join(
77+
u.Path,
78+
virtualworkspacesoptions.DefaultRootPathPrefix,
79+
initializingworkspaces.VirtualWorkspaceName,
80+
string(initialization.InitializerForType(wt)),
81+
)
82+
83+
desiredURLs.Insert(u.String())
8984
}
9085

91-
for _, u := range sets.List(desiredURLs) {
86+
wt.Status.VirtualWorkspaces = nil
87+
88+
for _, u := range sets.List[string](desiredURLs) {
9289
wt.Status.VirtualWorkspaces = append(wt.Status.VirtualWorkspaces, tenancyv1alpha1.VirtualWorkspace{
9390
URL: u,
9491
})

0 commit comments

Comments
 (0)