Remove ClusterConfig resource (#8150)

api/client/proto/authservice.proto

@@ -40,6 +40,8 @@ enum Operation {
 
 // Event returns cluster event
 message Event {
+    reserved 7;
+
     // Operation identifies operation
     Operation Type = 1 [ (gogoproto.jsontag) = "type,omitempty" ];
     // Resource contains the updated resource
@@ -58,9 +60,6 @@ message Event {
             [ (gogoproto.jsontag) = "provision_token,omitempty" ];
         // ClusterNameV2 is a cluster name resource
         types.ClusterNameV2 ClusterName = 6 [ (gogoproto.jsontag) = "cluster_name,omitempty" ];
-        // ClusterConfig is a cluster configuration resource
-        types.ClusterConfigV3 ClusterConfig = 7
-            [ (gogoproto.jsontag) = "cluster_config,omitempty" ];
         // User is a user resource
         types.UserV2 User = 8 [ (gogoproto.jsontag) = "user,omitempty" ];
         // Role is a role resource

api/client/streamwatcher.go

@@ -127,9 +127,6 @@ func eventFromGRPC(in proto.Event) (*types.Event, error) {
 	} else if r := in.GetClusterName(); r != nil {
 		out.Resource = r
 		return &out, nil
-	} else if r := in.GetClusterConfig(); r != nil {
-		out.Resource = r
-		return &out, nil
 	} else if r := in.GetUser(); r != nil {
 		out.Resource = r
 		return &out, nil

api/types/clustername.go

@@ -141,7 +141,9 @@ func (c *ClusterNameV2) CheckAndSetDefaults() error {
 	if c.Spec.ClusterName == "" {
 		return trace.BadParameter("cluster name is required")
 	}
-
+	if c.Spec.ClusterID == "" {
+		return trace.BadParameter("cluster ID is required")
+	}
 	return nil
 }
 

api/types/constants.go

@@ -156,11 +156,11 @@ const (
 	MetaNameSessionRecordingConfig = "session-recording-config"
 
 	// KindClusterConfig is the resource that holds cluster level configuration.
+	// Deprecated: This does not correspond to an actual resource anymore but is
+	// still used when checking access to the new configuration resources, as an
+	// alternative to their individual resource kinds.
 	KindClusterConfig = "cluster_config"
 
-	// MetaNameClusterConfig is the exact name of the cluster config singleton resource.
-	MetaNameClusterConfig = "cluster-config"
-
 	// KindClusterAuditConfig is the resource that holds cluster audit configuration.
 	KindClusterAuditConfig = "cluster_audit_config"