Move internal types from finalizers to terminators

On-behalf-of: SAP <[email protected]>
Signed-off-by: Simon Bein <[email protected]>

Author: SimonTheLeg

config/crds/core.kcp.io_logicalclusters.yaml

@@ -69,17 +69,6 @@ spec:
                   DirectlyDeletable indicates that this logical cluster can be directly deleted by the user
                   from within by deleting the LogicalCluster object.
                 type: boolean
-              finalizers:
-                description: |-
-                  Finalizers are set on creation by the system and copied to status when
-                  finalization starts.
-                items:
-                  description: |-
-                    LogicalClusterFinalizer is a unique string corresponding to a logical cluster
-                    finalizer controller.
-                  pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
-                  type: string
-                type: array
               initializers:
                 description: |-
                   initializers are set on creation by the system and copied to status when
@@ -130,6 +119,17 @@ spec:
                 - resource
                 - uid
                 type: object
+              terminators:
+                description: |-
+                  Terminators are set on creation by the system and copied to status when
+                  termination starts.
+                items:
+                  description: |-
+                    LogicalClusterTerminator is a unique string corresponding to a logical cluster
+                    terminator controller.
+                  pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
+                  type: string
+                type: array
             type: object
           status:
             default: {}
@@ -187,18 +187,6 @@ spec:
                   - type
                   type: object
                 type: array
-              finalizers:
-                description: |-
-                  Finalizers are set on creation by the system and must be cleared
-                  by a controller before the logical cluster can be deleted. The LogicalCluster object
-                  will stay in the phase "Deleting" until all finalizers are cleared.
-                items:
-                  description: |-
-                    LogicalClusterFinalizer is a unique string corresponding to a logical cluster
-                    finalizer controller.
-                  pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
-                  type: string
-                type: array
               initializers:
                 description: |-
                   initializers are set on creation by the system and must be cleared
@@ -220,6 +208,18 @@ spec:
                 - Ready
                 - Unavailable
                 type: string
+              terminator:
+                description: |-
+                  Terminators are set on creation by the system and must be cleared
+                  by a controller before the logical cluster can be deleted. The LogicalCluster object
+                  will stay in the phase "Deleting" until all terminator are cleared.
+                items:
+                  description: |-
+                    LogicalClusterTerminator is a unique string corresponding to a logical cluster
+                    terminator controller.
+                  pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
+                  type: string
+                type: array
             type: object
         type: object
     served: true

config/crds/tenancy.kcp.io_workspaces.yaml

@@ -279,17 +279,6 @@ spec:
                   - type
                   type: object
                 type: array
-              finalizers:
-                description: |-
-                  finalizers must be cleared by a controller before the workspace is being
-                  deleted.
-                items:
-                  description: |-
-                    LogicalClusterFinalizer is a unique string corresponding to a logical cluster
-                    finalizer controller.
-                  pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
-                  type: string
-                type: array
               initializers:
                 description: |-
                   initializers must be cleared by a controller before the workspace is ready
@@ -310,6 +299,17 @@ spec:
                 - Ready
                 - Unavailable
                 type: string
+              terminators:
+                description: |-
+                  terminators must be cleared by a controller before the workspace is being
+                  deleted.
+                items:
+                  description: |-
+                    LogicalClusterTerminator is a unique string corresponding to a logical cluster
+                    terminator controller.
+                  pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
+                  type: string
+                type: array
             type: object
         required:
         - spec

config/crds/tenancy.kcp.io_workspacetypes.yaml

@@ -157,18 +157,6 @@ spec:
                       type: object
                     type: array
                 type: object
-              finalizer:
-                description: |-
-                  Finalizer determines if this WorkspaceType has an associated finalizing
-                  controller. These controllers are used to add functionality to a Workspace;
-                  all controllers must finish their work before the Workspace is being deleted.
-
-                  One finalizing controller is supported per WorkspaceType; the identifier
-                  for this finalizer will be a colon-delimited string using the workspace in which
-                  the WorkspaceType is defined, and the type's name. For example, if a
-                  WorkspaceType `example` is created in the `root:org` workspace, the implicit
-                  finalizer name is `root:org:example`.
-                type: boolean
               initializer:
                 description: |-
                   initializer determines if this WorkspaceType has an associated initializing
@@ -261,6 +249,18 @@ spec:
                     minItems: 1
                     type: array
                 type: object
+              terminator:
+                description: |-
+                  Terminator determines if this WorkspaceType has an associated terminating
+                  controller. These controllers are used to add functionality to a Workspace;
+                  all controllers must finish their work before the Workspace is being deleted.
+
+                  One terminating controller is supported per WorkspaceType; the identifier
+                  for this terminator will be a colon-delimited string using the workspace in which
+                  the WorkspaceType is defined, and the type's name. For example, if a
+                  WorkspaceType `example` is created in the `root:org` workspace, the implicit
+                  terminator name is `root:org:example`.
+                type: boolean
             type: object
           status:
             description: WorkspaceTypeStatus defines the observed state of WorkspaceType.

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

@@ -14,12 +14,12 @@ spec:
       crd: {}
   - group: tenancy.kcp.io
     name: workspaces
-    schema: v250820-d9a41c325.workspaces.tenancy.kcp.io
+    schema: v251015-1d163d0e5.workspaces.tenancy.kcp.io
     storage:
       crd: {}
   - group: tenancy.kcp.io
     name: workspacetypes
-    schema: v250603-d4d365c8e.workspacetypes.tenancy.kcp.io
+    schema: v251015-1d163d0e5.workspacetypes.tenancy.kcp.io
     storage:
       crd: {}
 status: {}

config/root-phase0/apiresourceschema-logicalclusters.core.kcp.io.yaml

@@ -2,7 +2,7 @@ apiVersion: apis.kcp.io/v1alpha1
 kind: APIResourceSchema
 metadata:
   creationTimestamp: null
-  name: v250820-d9a41c325.logicalclusters.core.kcp.io
+  name: v251015-1d163d0e5.logicalclusters.core.kcp.io
 spec:
   group: core.kcp.io
   names:
@@ -67,17 +67,6 @@ spec:
                 DirectlyDeletable indicates that this logical cluster can be directly deleted by the user
                 from within by deleting the LogicalCluster object.
               type: boolean
-            finalizers:
-              description: |-
-                Finalizers are set on creation by the system and copied to status when
-                finalization starts.
-              items:
-                description: |-
-                  LogicalClusterFinalizer is a unique string corresponding to a logical cluster
-                  finalizer controller.
-                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
-                type: string
-              type: array
             initializers:
               description: |-
                 initializers are set on creation by the system and copied to status when
@@ -128,6 +117,17 @@ spec:
               - resource
               - uid
               type: object
+            terminators:
+              description: |-
+                Terminators are set on creation by the system and copied to status when
+                termination starts.
+              items:
+                description: |-
+                  LogicalClusterTerminator is a unique string corresponding to a logical cluster
+                  terminator controller.
+                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
+                type: string
+              type: array
           type: object
         status:
           default: {}
@@ -185,18 +185,6 @@ spec:
                 - type
                 type: object
               type: array
-            finalizers:
-              description: |-
-                Finalizers are set on creation by the system and must be cleared
-                by a controller before the logical cluster can be deleted. The LogicalCluster object
-                will stay in the phase "Deleting" until all finalizers are cleared.
-              items:
-                description: |-
-                  LogicalClusterFinalizer is a unique string corresponding to a logical cluster
-                  finalizer controller.
-                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
-                type: string
-              type: array
             initializers:
               description: |-
                 initializers are set on creation by the system and must be cleared
@@ -218,6 +206,18 @@ spec:
               - Ready
               - Unavailable
               type: string
+            terminator:
+              description: |-
+                Terminators are set on creation by the system and must be cleared
+                by a controller before the logical cluster can be deleted. The LogicalCluster object
+                will stay in the phase "Deleting" until all terminator are cleared.
+              items:
+                description: |-
+                  LogicalClusterTerminator is a unique string corresponding to a logical cluster
+                  terminator controller.
+                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
+                type: string
+              type: array
           type: object
       type: object
     served: true

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

@@ -2,7 +2,7 @@ apiVersion: apis.kcp.io/v1alpha1
 kind: APIResourceSchema
 metadata:
   creationTimestamp: null
-  name: v250820-d9a41c325.workspaces.tenancy.kcp.io
+  name: v251015-1d163d0e5.workspaces.tenancy.kcp.io
 spec:
   group: tenancy.kcp.io
   names:
@@ -277,17 +277,6 @@ spec:
                 - type
                 type: object
               type: array
-            finalizers:
-              description: |-
-                finalizers must be cleared by a controller before the workspace is being
-                deleted.
-              items:
-                description: |-
-                  LogicalClusterFinalizer is a unique string corresponding to a logical cluster
-                  finalizer controller.
-                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
-                type: string
-              type: array
             initializers:
               description: |-
                 initializers must be cleared by a controller before the workspace is ready
@@ -308,6 +297,17 @@ spec:
               - Ready
               - Unavailable
               type: string
+            terminators:
+              description: |-
+                terminators must be cleared by a controller before the workspace is being
+                deleted.
+              items:
+                description: |-
+                  LogicalClusterTerminator is a unique string corresponding to a logical cluster
+                  terminator controller.
+                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(:[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[a-z0-9][a-z0-9]([-a-z0-9]*[a-z0-9])?))|(system:.+)$
+                type: string
+              type: array
           type: object
       required:
       - spec

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

@@ -2,7 +2,7 @@ apiVersion: apis.kcp.io/v1alpha1
 kind: APIResourceSchema
 metadata:
   creationTimestamp: null
-  name: v250603-d4d365c8e.workspacetypes.tenancy.kcp.io
+  name: v251015-1d163d0e5.workspacetypes.tenancy.kcp.io
 spec:
   group: tenancy.kcp.io
   names:
@@ -155,18 +155,6 @@ spec:
                     type: object
                   type: array
               type: object
-            finalizer:
-              description: |-
-                Finalizer determines if this WorkspaceType has an associated finalizing
-                controller. These controllers are used to add functionality to a Workspace;
-                all controllers must finish their work before the Workspace is being deleted.
-
-                One finalizing controller is supported per WorkspaceType; the identifier
-                for this finalizer will be a colon-delimited string using the workspace in which
-                the WorkspaceType is defined, and the type's name. For example, if a
-                WorkspaceType `example` is created in the `root:org` workspace, the implicit
-                finalizer name is `root:org:example`.
-              type: boolean
             initializer:
               description: |-
                 initializer determines if this WorkspaceType has an associated initializing
@@ -259,6 +247,18 @@ spec:
                   minItems: 1
                   type: array
               type: object
+            terminator:
+              description: |-
+                Terminator determines if this WorkspaceType has an associated terminating
+                controller. These controllers are used to add functionality to a Workspace;
+                all controllers must finish their work before the Workspace is being deleted.
+
+                One terminating controller is supported per WorkspaceType; the identifier
+                for this terminator will be a colon-delimited string using the workspace in which
+                the WorkspaceType is defined, and the type's name. For example, if a
+                WorkspaceType `example` is created in the `root:org` workspace, the implicit
+                terminator name is `root:org:example`.
+              type: boolean
           type: object
         status:
           description: WorkspaceTypeStatus defines the observed state of WorkspaceType.

pkg/admission/logicalcluster/admission.go

@@ -111,7 +111,7 @@ func (o *plugin) Admit(ctx context.Context, a admission.Attributes, _ admission.
 
 		logicalCluster.Status.Initializers = logicalCluster.Spec.Initializers
 
-		logicalCluster.Status.Finalizers = logicalCluster.Spec.Finalizers
+		logicalCluster.Status.Terminators = logicalCluster.Spec.Terminators
 
 		return updateUnstructured(u, logicalCluster)
 	}