make initializer and terminator workspace URLs distinguishable

config/crds/tenancy.kcp.io_workspacetypes.yaml

@@ -316,6 +316,13 @@ spec:
                   URLs.
                 items:
                   properties:
+                    type:
+                      description: type indicates the type of virtual workspace this
+                        URL represents.
+                      enum:
+                      - initializing
+                      - terminating
+                      type: string
                     url:
                       description: url is a WorkspaceType initialization virtual workspace
                         URL.

config/root-phase0/apiexport-tenancy.kcp.io.yaml

@@ -18,7 +18,7 @@ spec:
       crd: {}
   - group: tenancy.kcp.io
     name: workspacetypes
-    schema: v251015-1d163d0e5.workspacetypes.tenancy.kcp.io
+    schema: v251204-7c13b4e0a.workspacetypes.tenancy.kcp.io
     storage:
       crd: {}
 status: {}

config/root-phase0/apiresourceschema-workspacetypes.tenancy.kcp.io.yaml

@@ -1,7 +1,7 @@
 apiVersion: apis.kcp.io/v1alpha1
 kind: APIResourceSchema
 metadata:
-  name: v251015-1d163d0e5.workspacetypes.tenancy.kcp.io
+  name: v251204-7c13b4e0a.workspacetypes.tenancy.kcp.io
 spec:
   group: tenancy.kcp.io
   names:
@@ -312,6 +312,13 @@ spec:
                 URLs.
               items:
                 properties:
+                  type:
+                    description: type indicates the type of virtual workspace this
+                      URL represents.
+                    enum:
+                    - initializing
+                    - terminating
+                    type: string
                   url:
                     description: url is a WorkspaceType initialization virtual workspace
                       URL.

pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go

@@ -22,7 +22,6 @@ import (
 	"net/url"
 	"path"
 
-	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
 
 	"github.com/kcp-dev/sdk/apis/tenancy/initialization"
@@ -63,7 +62,7 @@ func (c *controller) updateVirtualWorkspaceURLs(ctx context.Context, wt *tenancy
 		return fmt.Errorf("error listing Shards: %w", err)
 	}
 
-	desiredURLs := sets.New[string]()
+	desiredURLs := make(map[string]tenancyv1alpha1.VirtualWorkspaceType)
 	for _, shard := range shards {
 		if shard.Spec.VirtualWorkspaceURL == "" {
 			continue
@@ -85,24 +84,25 @@ func (c *controller) updateVirtualWorkspaceURLs(ctx context.Context, wt *tenancy
 			string(initialization.InitializerForType(wt)),
 		)
 
-		desiredURLs.Insert(u.String())
+		desiredURLs[u.String()] = tenancyv1alpha1.VirtualWorkspaceTypeInitializing
 
-		// add finalizing workspace URLs
+		// add terminating workspace URLs
 		u.Path = path.Join(
 			base,
 			virtualworkspacesoptions.DefaultRootPathPrefix,
 			terminatingworkspaces.VirtualWorkspaceName,
 			string(termination.TerminatorForType(wt)),
 		)
 
-		desiredURLs.Insert(u.String())
+		desiredURLs[u.String()] = tenancyv1alpha1.VirtualWorkspaceTypeTerminating
 	}
 
 	wt.Status.VirtualWorkspaces = nil
 
-	for _, u := range sets.List(desiredURLs) {
+	for url, vwType := range desiredURLs {
 		wt.Status.VirtualWorkspaces = append(wt.Status.VirtualWorkspaces, tenancyv1alpha1.VirtualWorkspace{
-			URL: u,
+			URL:  url,
+			Type: vwType,
 		})
 	}
 

pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile_test.go

@@ -137,12 +137,30 @@ func TestReconcile(t *testing.T) {
 				},
 				Status: tenancyv1alpha1.WorkspaceTypeStatus{
 					VirtualWorkspaces: []tenancyv1alpha1.VirtualWorkspace{
-						{URL: "https://item.com/services/initializingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://item.com/services/terminatingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://something.com/services/initializingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://something.com/services/terminatingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://whatever.com/services/initializingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://whatever.com/services/terminatingworkspaces/root:org:team:ws:sometype"},
+						{
+							URL:  "https://item.com/services/initializingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeInitializing,
+						},
+						{
+							URL:  "https://item.com/services/terminatingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeTerminating,
+						},
+						{
+							URL:  "https://something.com/services/initializingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeInitializing,
+						},
+						{
+							URL:  "https://something.com/services/terminatingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeTerminating,
+						},
+						{
+							URL:  "https://whatever.com/services/initializingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeInitializing,
+						},
+						{
+							URL:  "https://whatever.com/services/terminatingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeTerminating,
+						},
 					},
 					Conditions: conditionsv1alpha1.Conditions{
 						{
@@ -173,7 +191,10 @@ func TestReconcile(t *testing.T) {
 				},
 				Status: tenancyv1alpha1.WorkspaceTypeStatus{
 					VirtualWorkspaces: []tenancyv1alpha1.VirtualWorkspace{
-						{URL: "https://item.com/services/initializingworkspaces/root:org:team:ws:sometype"},
+						{
+							URL:  "https://item.com/services/initializingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeInitializing,
+						},
 					},
 					Conditions: conditionsv1alpha1.Conditions{
 						{
@@ -196,12 +217,30 @@ func TestReconcile(t *testing.T) {
 				},
 				Status: tenancyv1alpha1.WorkspaceTypeStatus{
 					VirtualWorkspaces: []tenancyv1alpha1.VirtualWorkspace{
-						{URL: "https://item.com/services/initializingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://item.com/services/terminatingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://something.com/services/initializingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://something.com/services/terminatingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://whatever.com/services/initializingworkspaces/root:org:team:ws:sometype"},
-						{URL: "https://whatever.com/services/terminatingworkspaces/root:org:team:ws:sometype"},
+						{
+							URL:  "https://item.com/services/initializingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeInitializing,
+						},
+						{
+							URL:  "https://item.com/services/terminatingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeTerminating,
+						},
+						{
+							URL:  "https://something.com/services/initializingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeInitializing,
+						},
+						{
+							URL:  "https://something.com/services/terminatingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeTerminating,
+						},
+						{
+							URL:  "https://whatever.com/services/initializingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeInitializing,
+						},
+						{
+							URL:  "https://whatever.com/services/terminatingworkspaces/root:org:team:ws:sometype",
+							Type: tenancyv1alpha1.VirtualWorkspaceTypeTerminating,
+						},
 					},
 					Conditions: conditionsv1alpha1.Conditions{
 						{
@@ -237,7 +276,17 @@ func TestReconcile(t *testing.T) {
 			}
 			c.reconcile(context.TODO(), testCase.wt)
 			c.reconcile(context.TODO(), testCase.wt) // relationships require resolved extensions
-			if diff := cmp.Diff(testCase.wt, testCase.expected, cmpopts.IgnoreTypes(metav1.Time{})); diff != "" {
+			if diff := cmp.Diff(
+				testCase.wt,
+				testCase.expected,
+				cmpopts.IgnoreTypes(metav1.Time{}),
+				cmpopts.SortSlices(func(a, b tenancyv1alpha1.VirtualWorkspace) bool {
+					if a.URL != b.URL { // SortSlices makes the comparison order-agnostic
+						return a.URL < b.URL
+					}
+					return a.Type < b.Type
+				}),
+			); diff != "" {
 				t.Errorf("incorrect WorkspaceType after reconciliation: %v", diff)
 			}
 		})

staging/src/github.com/kcp-dev/sdk/apis/tenancy/v1alpha1/types_workspacetype.go

@@ -244,8 +244,24 @@ type VirtualWorkspace struct {
 	// +kubebuilder:format:URL
 	// +required
 	URL string `json:"url"`
+
+	// type indicates the type of virtual workspace this URL represents.
+	//
+	// +optional
+	// +kubebuilder:validation:Enum=initializing;terminating
+	Type VirtualWorkspaceType `json:"type,omitempty"`
 }
 
+// VirtualWorkspaceType indicates the type of virtual workspace.
+type VirtualWorkspaceType string
+
+const (
+	// VirtualWorkspaceTypeInitializing indicates this is an initializing workspace URL.
+	VirtualWorkspaceTypeInitializing VirtualWorkspaceType = "initializing"
+	// VirtualWorkspaceTypeTerminating indicates this is a terminating workspace URL.
+	VirtualWorkspaceTypeTerminating VirtualWorkspaceType = "terminating"
+)
+
 func (in *WorkspaceType) GetConditions() conditionsv1alpha1.Conditions {
 	return in.Status.Conditions
 }