rename to cluster because it's more generic

On-behalf-of: @SAP [email protected]

Author: xrstf

config/crd/bases/operator.kcp.io_kubeconfigs.yaml

@@ -45,15 +45,17 @@ spec:
                 properties:
                   clusterRoleBindings:
                     properties:
+                      cluster:
+                        description: Cluster can be either a cluster name or a workspace
+                          path.
+                        type: string
                       clusterRoles:
                         items:
                           type: string
                         type: array
-                      workspacePath:
-                        type: string
                     required:
+                    - cluster
                     - clusterRoles
-                    - workspacePath
                     type: object
                 required:
                 - clusterRoleBindings
@@ -361,10 +363,10 @@ spec:
             properties:
               authorization:
                 properties:
-                  provisionedWorkspace:
+                  provisionedCluster:
                     type: string
                 required:
-                - provisionedWorkspace
+                - provisionedCluster
                 type: object
             type: object
         type: object

internal/controller/kubeconfig-rbac/controller.go

@@ -114,7 +114,7 @@ func (r *KubeconfigRBACReconciler) reconcile(ctx context.Context, config *operat
 }
 
 func (r *KubeconfigRBACReconciler) reconcileBindings(ctx context.Context, kc *operatorv1alpha1.Kubeconfig) error {
-	targetClient, err := client.NewInternalKubeconfigClient(ctx, r.Client, kc, logicalcluster.Name(kc.Spec.Authorization.ClusterRoleBindings.WorkspacePath), nil)
+	targetClient, err := client.NewInternalKubeconfigClient(ctx, r.Client, kc, logicalcluster.Name(kc.Spec.Authorization.ClusterRoleBindings.Cluster), nil)
 	if err != nil {
 		return fmt.Errorf("failed to create client to kubeconfig target: %w", err)
 	}
@@ -171,7 +171,7 @@ func (r *KubeconfigRBACReconciler) handleDeletion(ctx context.Context, kc *opera
 		return nil
 	}
 
-	targetClient, err := client.NewInternalKubeconfigClient(ctx, r.Client, kc, logicalcluster.Name(kc.Spec.Authorization.ClusterRoleBindings.WorkspacePath), nil)
+	targetClient, err := client.NewInternalKubeconfigClient(ctx, r.Client, kc, logicalcluster.Name(kc.Spec.Authorization.ClusterRoleBindings.Cluster), nil)
 	if err != nil {
 		return fmt.Errorf("failed to create client to kubeconfig target: %w", err)
 	}

sdk/apis/operator/v1alpha1/kubeconfig_types.go

@@ -58,8 +58,9 @@ type KubeconfigAuthorization struct {
 }
 
 type KubeconfigClusterRoleBindings struct {
-	WorkspacePath string   `json:"workspacePath"`
-	ClusterRoles  []string `json:"clusterRoles"`
+	// Cluster can be either a cluster name or a workspace path.
+	Cluster      string   `json:"cluster"`
+	ClusterRoles []string `json:"clusterRoles"`
 }
 
 // KubeconfigStatus defines the observed state of Kubeconfig
@@ -68,7 +69,7 @@ type KubeconfigStatus struct {
 }
 
 type KubeconfigAuthorizationStatus struct {
-	ProvisionedWorkspace string `json:"provisionedWorkspace"`
+	ProvisionedCluster string `json:"provisionedCluster"`
 }
 
 // +genclient