revert: restore single-project layout and merge Fluent Bit maintainers into fluentd

CODEOWNERS

@@ -1,3 +1,3 @@
 # CODEOWNERS for .project metadata repository
 # Changes to project metadata require maintainer review.
-* @sonots @okkez @cosmo0920 @repeatedly @tagomoris @edsiper @kenhys @ashie @toru-takahashi @daipom @patrick-stephens 
+* @sonots @okkez @cosmo0920 @repeatedly @tagomoris @edsiper @kenhys @ashie @toru-takahashi @daipom @patrick-stephens @fujimotos @leonardo-albertovich @koleini @PettitWesley @clamoriniere @sxd @niedbalski @eschabell

README.md

@@ -1,35 +1,18 @@
-# Fluent `.project`
+# Fluentd `.project`
 
 `.project` (dot-project) is a CNCF initiative to centralize and automate metadata management for all CNCF projects.
-This repository holds the canonical metadata for the CNCF projects maintained in the `fluent` organization, and is maintained by the CNCF automation tooling.
+This repository holds the canonical metadata for [Fluentd](https://www.fluentd.org/) and is maintained by the CNCF automation tooling.
 
 ## What's in this repo
 
 | File | Purpose |
 |------|---------|
-| `org.yaml` | Index of the CNCF projects maintained in this organization |
-| `<project>/project.yaml` | Canonical metadata for one project (name, maturity, repositories, governance links, …) |
-| `<project>/maintainers.yaml` | Maintainer and reviewer roster for one project |
+| `project.yaml` | Canonical project metadata (name, maturity, repositories, governance links, …) |
+| `maintainers.yaml` | Maintainer and reviewer roster used for drift detection and mailing-list sync |
 | `CODEOWNERS` | Ensures PRs to this repo require maintainer approval |
 | `.github/workflows/validate.yaml` | CI — validates `project.yaml` and `maintainers.yaml` on every PR |
 | `.github/workflows/update-landscape.yml` | Automatically proposes landscape updates when `project.yaml` changes |
 
-## Projects in this repository
-
-This GitHub organization maintains more than one CNCF project. Each is a
-separate project from CNCF's point of view — its own maturity, its own
-landscape entry — so each owns a directory with its own metadata, and
-`org.yaml` indexes them:
-
-| Project | Directory |
-|---------|-----------|
-| Fluentd | [`fluentd/`](./fluentd/) |
-| Fluent Bit | [`fluent-bit/`](./fluent-bit) |
-
-Add or remove a project by editing `org.yaml` and its directory together;
-validation fails if the two disagree. See the
-[repository layouts reference](https://github.com/cncf/automation/tree/main/utilities/dot-project#repository-layouts).
-
 ## Keeping metadata up to date
 
 Open a pull request against this repository to update any metadata field.

fluent-bit/maintainers.yaml → maintainers.yaml

@@ -1,14 +1,27 @@
-# Maintainer roster for Fluent Bit
+# Maintainer roster for Fluentd
 # Documentation: https://github.com/cncf/automation/tree/main/utilities/dot-project
 
 
 #  Maintainers: Please connect your GitHub handle to your LFID on openprofile.dev to enable automatic access to CNCF resources. The system will use your primary email address for setup.
 maintainers:
-  - project_id: "fluent-bit"
+  - project_id: "fluentd"
     org: "fluent"
     teams:
+      # Source of truth: https://github.com/fluent/fluentd/blob/master/MAINTAINERS.md
+      - name: "fluentd-maintainers"
+        members:
+          - sonots
+          - okkez
+          - cosmo0920
+          - repeatedly
+          - tagomoris
+          - edsiper
+          - kenhys
+          - ashie
+          - toru-takahashi
+          - daipom
+          - fujimotos
       # Source of truth: https://github.com/fluent/fluent-bit/blob/master/MAINTAINERS.md
-      # TODO: Fluent Bit maintainers — please verify this roster
       - name: "fluent-bit-maintainers"
         members:
           - edsiper
@@ -21,6 +34,7 @@ maintainers:
           - sxd
           - niedbalski
           - patrick-stephens
+          - eschabell
       # Unmanaged teams: teams with "managed: false" are tracked in this
       # file for documentation but are excluded from CNCF resource
       # provisioning (mailing lists, service desk, Copilot seats, etc).
@@ -34,4 +48,4 @@ maintainers:
       # Former maintainers (remove this section if not applicable):
       # - name: "emeritus"
       #   managed: false
-      #   members: []
+      #   members: []