Merge pull request #3438 from embik/fix-logicalcluster-owner-annotation

Do not set the owner annotation on `LogicalClusters` to empty value

Author: kcp-ci-bot

pkg/reconciler/tenancy/logicalcluster/logicalcluster_controller.go

@@ -201,9 +201,11 @@ func (c *Controller) process(ctx context.Context, key string) error {
 		return nil
 	}
 
-	// need to create
-	ownerAnnotation, found := logicalCluster.Annotations[tenancyv1alpha1.ExperimentalWorkspaceOwnerAnnotationKey]
-	if !found {
+	// need to create ClusterRoleBinding for owner.
+	ownerAnnotation := logicalCluster.Annotations[tenancyv1alpha1.ExperimentalWorkspaceOwnerAnnotationKey]
+	// some older installations of kcp might have produced an annotation with empty value, so we should
+	// not care whether the annotation is set or if it's empty.
+	if ownerAnnotation == "" {
 		// no owner - can't create
 		return nil
 	}

pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling.go

@@ -247,9 +247,8 @@ func (r *schedulingReconciler) createLogicalCluster(ctx context.Context, shard *
 		ObjectMeta: metav1.ObjectMeta{
 			Name: corev1alpha1.LogicalClusterName,
 			Annotations: map[string]string{
-				tenancyv1alpha1.ExperimentalWorkspaceOwnerAnnotationKey: workspace.Annotations[tenancyv1alpha1.ExperimentalWorkspaceOwnerAnnotationKey],
-				tenancyv1alpha1.LogicalClusterTypeAnnotationKey:         logicalcluster.NewPath(workspace.Spec.Type.Path).Join(string(workspace.Spec.Type.Name)).String(),
-				core.LogicalClusterPathAnnotationKey:                    canonicalPath.String(),
+				tenancyv1alpha1.LogicalClusterTypeAnnotationKey: logicalcluster.NewPath(workspace.Spec.Type.Path).Join(string(workspace.Spec.Type.Name)).String(),
+				core.LogicalClusterPathAnnotationKey:            canonicalPath.String(),
 			},
 		},
 		Spec: corev1alpha1.LogicalClusterSpec{