rename packages to terminator naming

SimonTheLeg · SimonTheLeg · commit 19856711681d · 2025-10-17T10:41:24.000+02:00
- pkg/virtual/finalizingworkspaces
- sdk/apis/tenancyfinalization
- test/e2e/virtual/finalizingworkspaces

On-behalf-of: SAP &lt;simon.bein@sap.com&gt;
Signed-off-by: Simon Bein &lt;simontheleg@gmail.com&gt;
diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata.go b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata.go
@@ -26,8 +26,8 @@ import (
 	"k8s.io/klog/v2"
 
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
-	"github.com/kcp-dev/kcp/sdk/apis/tenancy/finalization"
 	"github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization"
+	"github.com/kcp-dev/kcp/sdk/apis/tenancy/termination"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 )
 
@@ -67,7 +67,7 @@ func (r *metaDataReconciler) reconcile(ctx context.Context, logicalCluster *core
 	// add finalizers from the status as hashed labels
 	finalizerKeys := sets.New[string]()
 	for _, finalizer := range logicalCluster.Status.Finalizers {
-		key, value := finalization.FinalizerToLabel(finalizer)
+		key, value := termination.FinalizerToLabel(finalizer)
 		finalizerKeys.Insert(key)
 		if got, expected := logicalCluster.Labels[key], value; got != expected {
 			if logicalCluster.Labels == nil {
diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling.go
@@ -44,8 +44,8 @@ import (
 	"github.com/kcp-dev/kcp/pkg/logging"
 	"github.com/kcp-dev/kcp/sdk/apis/core"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
-	"github.com/kcp-dev/kcp/sdk/apis/tenancy/finalization"
 	"github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization"
+	"github.com/kcp-dev/kcp/sdk/apis/tenancy/termination"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 	conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1"
 	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
@@ -327,7 +327,7 @@ func (r *schedulingReconciler) createLogicalCluster(ctx context.Context, shard *
 	}
 	logicalCluster.Spec.Finalizers = finalizers
 	// append our finalizers to already existing ObjectMeta finalizers
-	logicalCluster.ObjectMeta.Finalizers = finalization.MergeFinalizersUnique(finalizers, logicalCluster.ObjectMeta.Finalizers)
+	logicalCluster.ObjectMeta.Finalizers = termination.MergeFinalizersUnique(finalizers, logicalCluster.ObjectMeta.Finalizers)
 
 	logicalClusterAdminClient, err := r.kcpLogicalClusterAdminClientFor(shard)
 	if err != nil {
@@ -401,7 +401,7 @@ func LogicalClustersFinalizers(
 
 	for _, alias := range wtAliases {
 		if alias.Spec.Finalizer {
-			finalizers = append(finalizers, finalization.FinalizerForType(alias))
+			finalizers = append(finalizers, termination.FinalizerForType(alias))
 		}
 	}
 
diff --git a/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go b/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go
@@ -26,10 +26,10 @@ import (
 	"k8s.io/klog/v2"
 
 	virtualworkspacesoptions "github.com/kcp-dev/kcp/cmd/virtual-workspaces/options"
-	"github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces"
 	"github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces"
-	"github.com/kcp-dev/kcp/sdk/apis/tenancy/finalization"
+	"github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces"
 	"github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization"
+	"github.com/kcp-dev/kcp/sdk/apis/tenancy/termination"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 	conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1"
 	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
@@ -90,8 +90,8 @@ func (c *controller) updateVirtualWorkspaceURLs(ctx context.Context, wt *tenancy
 		u.Path = path.Join(
 			base,
 			virtualworkspacesoptions.DefaultRootPathPrefix,
-			finalizingworkspaces.VirtualWorkspaceName,
-			string(finalization.FinalizerForType(wt)),
+			terminatingworkspaces.VirtualWorkspaceName,
+			string(termination.FinalizerForType(wt)),
 		)
 
 		desiredURLs.Insert(u.String())
diff --git a/pkg/virtual/options/options.go b/pkg/virtual/options/options.go
@@ -26,10 +26,10 @@ import (
 	kcpkubernetesinformers "github.com/kcp-dev/client-go/informers"
 
 	apiexportoptions "github.com/kcp-dev/kcp/pkg/virtual/apiexport/options"
-	finalizingworkspacesoptions "github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces/options"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver"
 	initializingworkspacesoptions "github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces/options"
 	replicationoptions "github.com/kcp-dev/kcp/pkg/virtual/replication/options"
+	finalizingworkspacesoptions "github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces/options"
 	kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions"
 )
 
diff --git a/pkg/virtual/terminatingworkspaces/builder/build.go b/pkg/virtual/terminatingworkspaces/builder/build.go
@@ -40,22 +40,22 @@ import (
 	rootphase0 "github.com/kcp-dev/kcp/config/root-phase0"
 	"github.com/kcp-dev/kcp/pkg/authorization/delegated"
 	"github.com/kcp-dev/kcp/pkg/server/requestinfo"
-	"github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework"
 	virtualworkspacesdynamic "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apiserver"
 	dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver"
+	"github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces"
 	apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
-	"github.com/kcp-dev/kcp/sdk/apis/tenancy/finalization"
+	"github.com/kcp-dev/kcp/sdk/apis/tenancy/termination"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 )
 
 const (
-	wildcardLogicalClustersName = finalizingworkspaces.VirtualWorkspaceName + "-wildcard-logicalclusters"
-	logicalClustersName         = finalizingworkspaces.VirtualWorkspaceName + "-logicalclusters"
+	wildcardLogicalClustersName = terminatingworkspaces.VirtualWorkspaceName + "-wildcard-logicalclusters"
+	logicalClustersName         = terminatingworkspaces.VirtualWorkspaceName + "-logicalclusters"
 )
 
 func BuildVirtualWorkspace(
@@ -264,7 +264,7 @@ func (a *singleResourceAPIDefinitionSetProvider) GetAPIDefinitionSet(ctx context
 var _ apidefinition.APIDefinitionSetGetter = &singleResourceAPIDefinitionSetProvider{}
 
 func authorizerWithCache(ctx context.Context, cache delegated.Cache, attr authorizer.Attributes) (authorizer.Decision, string, error) {
-	clusterName, name, err := finalization.TypeFrom(corev1alpha1.LogicalClusterFinalizer(dynamiccontext.APIDomainKeyFrom(ctx)))
+	clusterName, name, err := termination.TypeFrom(corev1alpha1.LogicalClusterFinalizer(dynamiccontext.APIDomainKeyFrom(ctx)))
 	if err != nil {
 		klog.FromContext(ctx).V(2).Info(err.Error())
 		return authorizer.DecisionNoOpinion, "unable to determine finalizer", fmt.Errorf("access not permitted")
diff --git a/pkg/virtual/terminatingworkspaces/builder/build_test.go b/pkg/virtual/terminatingworkspaces/builder/build_test.go
diff --git a/pkg/virtual/terminatingworkspaces/builder/forwarding.go b/pkg/virtual/terminatingworkspaces/builder/forwarding.go
@@ -44,7 +44,7 @@ import (
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apiserver"
 	registry "github.com/kcp-dev/kcp/pkg/virtual/framework/forwardingregistry"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
-	"github.com/kcp-dev/kcp/sdk/apis/tenancy/finalization"
+	"github.com/kcp-dev/kcp/sdk/apis/tenancy/termination"
 )
 
 // filteredLogicalClusterReadWriteRestStorage creates a RestProvider which will
@@ -253,7 +253,7 @@ func logicalClusterFromObject(obj runtime.Object) (*corev1alpha1.LogicalCluster,
 func finalizerLabelSetRequirement(finalizer corev1alpha1.LogicalClusterFinalizer) (labels.Requirements, error) {
 	labelSelector := map[string]string{}
 
-	key, value := finalization.FinalizerToLabel(finalizer)
+	key, value := termination.FinalizerToLabel(finalizer)
 	labelSelector[key] = value
 
 	requirements, selectable := labels.SelectorFromSet(labelSelector).Requirements()
diff --git a/pkg/virtual/terminatingworkspaces/builder/forwarding_test.go b/pkg/virtual/terminatingworkspaces/builder/forwarding_test.go
diff --git a/pkg/virtual/terminatingworkspaces/doc.go b/pkg/virtual/terminatingworkspaces/doc.go
@@ -28,6 +28,6 @@ limitations under the License.
 // WATCH semantics are similar to (and implemented by) timestamp and finalizers selectors - a LogicalCluster that stops
 // matching the requirements to be served (not being marked for deletion, not requesting finalization by
 // the controller) will be removed from the stream with a synthetic Deleted event.
-package finalizingworkspaces
+package terminatingworkspaces
 
 const VirtualWorkspaceName string = "finalizingworkspaces"
diff --git a/pkg/virtual/terminatingworkspaces/options/options.go b/pkg/virtual/terminatingworkspaces/options/options.go
@@ -26,9 +26,9 @@ import (
 	kcpdynamic "github.com/kcp-dev/client-go/dynamic"
 	kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes"
 
-	"github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces"
-	"github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces/builder"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver"
+	"github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces"
+	"github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces/builder"
 	kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions"
 )
 
@@ -68,5 +68,5 @@ func (o *FinalizingWorkspaces) NewVirtualWorkspaces(
 		return nil, err
 	}
 
-	return builder.BuildVirtualWorkspace(config, path.Join(rootPathPrefix, finalizingworkspaces.VirtualWorkspaceName), dynamicClusterClient, kubeClusterClient)
+	return builder.BuildVirtualWorkspace(config, path.Join(rootPathPrefix, terminatingworkspaces.VirtualWorkspaceName), dynamicClusterClient, kubeClusterClient)
 }
diff --git a/sdk/apis/tenancy/termination/utils.go b/sdk/apis/tenancy/termination/utils.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package finalization
+package termination
 
 import (
 	"crypto/sha256"
diff --git a/sdk/apis/tenancy/termination/utils_test.go b/sdk/apis/tenancy/termination/utils_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package finalization
+package termination
 
 import (
 	"testing"
diff --git a/test/e2e/virtual/terminatingworkspaces/virtualworkspace_test.go b/test/e2e/virtual/terminatingworkspaces/virtualworkspace_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package finalizingworkspaces
+package terminatingworkspaces
 
 import (
 	"context"
@@ -46,10 +46,10 @@ import (
 	"github.com/kcp-dev/logicalcluster/v3"
 
 	"github.com/kcp-dev/kcp/cmd/virtual-workspaces/options"
-	"github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces"
+	"github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces"
 	"github.com/kcp-dev/kcp/sdk/apis/core"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
-	"github.com/kcp-dev/kcp/sdk/apis/tenancy/finalization"
+	"github.com/kcp-dev/kcp/sdk/apis/tenancy/termination"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
@@ -64,7 +64,7 @@ func TestFinalizingWorkspacesVirtualWorkspaceDiscovery(t *testing.T) {
 
 	source := kcptesting.SharedKcpServer(t)
 	rootShardCfg := source.RootShardSystemMasterBaseConfig(t)
-	rootShardCfg.Host += path.Join(options.DefaultRootPathPrefix, finalizingworkspaces.VirtualWorkspaceName, "something")
+	rootShardCfg.Host += path.Join(options.DefaultRootPathPrefix, terminatingworkspaces.VirtualWorkspaceName, "something")
 
 	virtualWorkspaceDiscoveryClient, err := kcpdiscovery.NewForConfig(rootShardCfg)
 	require.NoError(t, err)
@@ -240,7 +240,7 @@ func TestFinalizingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 	for name, wst := range workspaceTypes {
 		vwURLs := []string{}
 		for _, vwURL := range wst.Status.VirtualWorkspaces {
-			if strings.Contains(vwURL.URL, finalizingworkspaces.VirtualWorkspaceName) {
+			if strings.Contains(vwURL.URL, terminatingworkspaces.VirtualWorkspaceName) {
 				vwURLs = append(vwURLs, vwURL.URL)
 			}
 		}
@@ -288,7 +288,7 @@ func TestFinalizingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 		require.EventuallyWithT(t, func(c *assert.CollectT) {
 			role, err := kubeClusterClient.Cluster(wsPath).RbacV1().ClusterRoles().Create(ctx, &rbacv1.ClusterRole{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: string(finalization.FinalizerForType(wt)) + "-finalizer",
+					Name: string(termination.FinalizerForType(wt)) + "-finalizer",
 				},
 				Rules: []rbacv1.PolicyRule{
 					{
@@ -333,9 +333,9 @@ func TestFinalizingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 		}, wait.ForeverTestTimeout, 100*time.Millisecond)
 	}
 
-	alphaFinalizer := string(finalization.FinalizerForType(workspaceTypes["alpha"]))
-	betaFinalizer := string(finalization.FinalizerForType(workspaceTypes["beta"]))
-	gammaFinalizer := string(finalization.FinalizerForType(workspaceTypes["gamma"]))
+	alphaFinalizer := string(termination.FinalizerForType(workspaceTypes["alpha"]))
+	betaFinalizer := string(termination.FinalizerForType(workspaceTypes["beta"]))
+	gammaFinalizer := string(termination.FinalizerForType(workspaceTypes["gamma"]))
 	// expect alpha and beta to see two logicalclusters each: the one of their own
 	// respective workspacetype and the one from workspacetype gamma since it
 	// inherits both alpha and beta
@@ -366,7 +366,7 @@ func TestFinalizingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 
 		for _, cluster := range clusters.Items {
 			// check that spec finalizers are set correctly
-			specF := finalization.FinalizersToStrings(cluster.Spec.Finalizers)
+			specF := termination.FinalizersToStrings(cluster.Spec.Finalizers)
 			require.Contains(t, expLogicalClusters[name], specF) // contains compares the finalizers with all objects in the exp [][]string and does the heavy lifting for us
 		}
 	}
@@ -424,7 +424,7 @@ func TestFinalizingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 			require.NoError(c, err)
 		}, wait.ForeverTestTimeout, 100*time.Millisecond)
 
-		finalizer := finalization.FinalizerForType(workspaceTypes[name])
+		finalizer := termination.FinalizerForType(workspaceTypes[name])
 
 		for _, origLc := range origLcs.Items {
 			t.Log("\tModifying a non-finalizer field should be invalid")
@@ -471,7 +471,7 @@ func TestFinalizingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 
 	t.Log("Removing our finalizer should work")
 	for name := range workspaces {
-		finalizer := finalization.FinalizerForType(workspaceTypes[name])
+		finalizer := termination.FinalizerForType(workspaceTypes[name])
 		user1Client := user1VwKcpClusterClients[name]
 		var origLcs *corev1alpha1.LogicalClusterList
 
@@ -483,7 +483,7 @@ func TestFinalizingWorkspacesVirtualWorkspaceAccess(t *testing.T) {
 		for _, origLc := range origLcs.Items {
 			lcPath := logicalcluster.NewPath(origLc.Annotations["kcp.io/cluster"])
 			mod := origLc.DeepCopy()
-			mod.Finalizers = removeByValue(mod.Finalizers, finalization.FinalizerSpecToMetadata(finalizer))
+			mod.Finalizers = removeByValue(mod.Finalizers, termination.FinalizerSpecToMetadata(finalizer))
 			patch, err := generatePatchBytes(&origLc, mod)
 			require.NoError(t, err)
 			require.EventuallyWithT(t, func(c *assert.CollectT) {

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ import (`
`26`	`26`	`kcpdynamic "github.com/kcp-dev/client-go/dynamic"`
`27`	`27`	`kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes"`
`28`	`28`
`29`		`- "github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces"`
`30`		`- "github.com/kcp-dev/kcp/pkg/virtual/finalizingworkspaces/builder"`
`31`	`29`	`"github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver"`
	`30`	`+ "github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces"`
	`31`	`+ "github.com/kcp-dev/kcp/pkg/virtual/terminatingworkspaces/builder"`
`32`	`32`	`kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions"`
`33`	`33`	`)`
`34`	`34`
`@@ -68,5 +68,5 @@ func (o *FinalizingWorkspaces) NewVirtualWorkspaces(`
`68`	`68`	`return nil, err`
`69`	`69`	`}`
`70`	`70`
`71`		`- return builder.BuildVirtualWorkspace(config, path.Join(rootPathPrefix, finalizingworkspaces.VirtualWorkspaceName), dynamicClusterClient, kubeClusterClient)`
	`71`	`+ return builder.BuildVirtualWorkspace(config, path.Join(rootPathPrefix, terminatingworkspaces.VirtualWorkspaceName), dynamicClusterClient, kubeClusterClient)`
`72`	`72`	`}`