Add condition cleaning

Author: mjudeikis

pkg/reconciler/apis/apiexport/apiexport_controller_test.go

@@ -31,6 +31,7 @@ import (
 
 	"github.com/kcp-dev/logicalcluster/v3"
 
+	kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
 	apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
@@ -39,6 +40,9 @@ import (
 )
 
 func TestReconcile(t *testing.T) {
+	// Save original feature gate value
+	originalFeatureGate := kcpfeatures.DefaultFeatureGate.Enabled(kcpfeatures.EnableDeprecatedAPIExportVirtualWorkspacesUrls)
+
 	tests := map[string]struct {
 		secretRefSet                         bool
 		secretExists                         bool
@@ -63,6 +67,7 @@ func TestReconcile(t *testing.T) {
 		wantVerifyFailure                bool
 		wantIdentityValid                bool
 		wantCreateAPIExportEndpointSlice bool
+		wantVirtualWorkspaceURLs         bool
 	}{
 		"create secret when ref is nil and secret doesn't exist": {
 			secretExists: false,
@@ -144,10 +149,32 @@ func TestReconcile(t *testing.T) {
 			wantIdentityValid:                true,
 			skipEndpointSliceAnnotation:      true,
 		},
+		"virtual workspace URLs when feature gate enabled": {
+			secretRefSet: true,
+			secretExists: true,
+
+			wantStatusHashSet:        true,
+			wantIdentityValid:        true,
+			wantVirtualWorkspaceURLs: true,
+		},
+		"error listing shards with feature gate enabled": {
+			secretRefSet: true,
+			secretExists: true,
+
+			wantStatusHashSet:        true,
+			wantIdentityValid:        true,
+			wantVirtualWorkspaceURLs: false,
+			listShardsError:          errors.New("foo"),
+		},
 	}
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
+			// Skip virtual workspace URL tests if feature gate is not enabled
+			if tc.wantVirtualWorkspaceURLs && !originalFeatureGate {
+				t.Skip("Skipping test that requires EnableDeprecatedAPIExportVirtualWorkspacesUrls feature gate")
+			}
+
 			createSecretCalled := false
 			createEndpointSliceCalled := false
 
@@ -311,6 +338,15 @@ func TestReconcile(t *testing.T) {
 			}
 
 			require.Equal(t, tc.wantCreateAPIExportEndpointSlice, createEndpointSliceCalled, "expected createEndpointSliceCalled to be %v", tc.wantCreateAPIExportEndpointSlice)
+
+			if tc.wantVirtualWorkspaceURLs {
+				require.NotNil(t, apiExport.Status.VirtualWorkspaces, "expected virtual workspace URLs to be set")
+				require.Len(t, apiExport.Status.VirtualWorkspaces, 2, "expected 2 virtual workspace URLs")
+				require.True(t, conditions.IsTrue(apiExport, apisv1alpha2.APIExportVirtualWorkspaceURLsReady), "expected virtual workspace URLs to be ready")
+			} else {
+				require.Nil(t, apiExport.Status.VirtualWorkspaces, "expected virtual workspace URLs to be nil")
+				require.False(t, conditions.Has(apiExport, apisv1alpha2.APIExportVirtualWorkspaceURLsReady), "expected virtual workspace URLs condition to not exist")
+			}
 		})
 	}
 }

pkg/reconciler/apis/apiexport/apiexport_reconcile.go

@@ -134,8 +134,8 @@ func (c *controller) reconcile(ctx context.Context, apiExport *apisv1alpha2.APIE
 		}
 	}
 
-	// Ensure the APIExportEndpointSlice has a virtual workspace URL
-	// TODO(mjudeikis): Remove this and move to batteries.
+	// Ensure the APIExport has a virtual workspace URL
+	// TODO(mjudeikis): Remove this once we remove feature gate.
 	if kcpfeatures.DefaultFeatureGate.Enabled(kcpfeatures.EnableDeprecatedAPIExportVirtualWorkspacesUrls) {
 		if err := c.updateVirtualWorkspaceURLs(ctx, apiExport); err != nil {
 			conditions.MarkFalse(
@@ -147,6 +147,10 @@ func (c *controller) reconcile(ctx context.Context, apiExport *apisv1alpha2.APIE
 				err,
 			)
 		}
+	} else {
+		// Remove the condition and status.virtualWorkspaces if the feature gate is disabled.
+		conditions.Delete(apiExport, apisv1alpha2.APIExportVirtualWorkspaceURLsReady)
+		apiExport.Status.VirtualWorkspaces = nil
 	}
 
 	return nil