From 94dd0870a904d98d31195c24e18b87138da51658 Mon Sep 17 00:00:00 2001
From: Feroz Salam <feroz@argh.in>
Date: Mon, 5 Apr 2021 18:16:40 +0100
Subject: [PATCH 1/3] Stage 3 Orchestrator RFC

---
 rfcs/text/0012-orchestrator-field-set.md | 26 ++++--------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/rfcs/text/0012-orchestrator-field-set.md b/rfcs/text/0012-orchestrator-field-set.md
index c99da3a159..4e5e3b9a2a 100644
--- a/rfcs/text/0012-orchestrator-field-set.md
+++ b/rfcs/text/0012-orchestrator-field-set.md
@@ -1,6 +1,6 @@
 # 0012: Orchestrator field set creation
 
-- Stage: **2 (candidate)** <!-- Update to reflect target stage. See https://elastic.github.io/ecs/stages.html -->
+- Stage: **3 (finished)** <!-- Update to reflect target stage. See https://elastic.github.io/ecs/stages.html -->
 - Date: **2021-03-26** <!-- The ECS team sets this date at merge time. This is the date of the latest stage advancement. -->
 
 There is currently no ECS field set for container orchestration engines. There is an example of an ECS
@@ -93,10 +93,6 @@ The proposed change adds nine fields, as described below:
         API version being used to carry out the action
 ```
 
-<!--
-Stage 3: Add or update all remaining field definitions. The list should now be exhaustive. The goal here is to validate the technical details of all remaining fields and to provide a basis for releasing these field definitions as beta in the schema. Use GitHub code blocks with yml syntax formatting.
--->
-
 ## Usage
 
 The `orchestrator` field set will be used to capture typical concepts employed
@@ -198,10 +194,6 @@ Examples of source data include:
 }
 ```
 
-<!--
-Stage 3: Add more real world example source documents so we have at least 2 total, but ideally 3. Format as described in stage 2.
--->
-
 ## Scope of impact
 
 As this RFC involves the creation of an entirely new fieldset, no breaking
@@ -239,19 +231,8 @@ cover all the logical primitives of popular orchestrators. Input from contributo
 who have experience with the various alternative orchestration providers would be
 particularly valuable.
 
-<!--
-Stage 3: Document resolutions for all existing concerns. Any new concerns should be documented along with their resolution. The goal here is to eliminate the risk of churn and instability by resolving outstanding concerns.
--->
-
-<!--
-Stage 4: Document any new concerns and their resolution. The goal here is to eliminate risk of churn and instability by ensuring all concerns have been addressed.
--->
-
-## Real-world implementations
-
-<!--
-Stage 4: Identify at least one real-world, production-ready implementation that uses these updated field definitions. An example of this might be a GA feature in an Elastic application in Kibana.
--->
+*Resolution*: Input from various orchestrators has been considered to ensure this field
+set remains as generic as possible.
 
 ## People
 
@@ -275,6 +256,7 @@ The following are the people that consulted on the contents of this RFC.
 * Stage 0: https://github.com/elastic/ecs/pull/1209
 * Stage 1: https://github.com/elastic/ecs/pull/1230
 * Stage 2: https://github.com/elastic/ecs/pull/1299
+* Stage 3: 
 
 [0]: https://github.com/elastic/ecs/blob/master/use-cases/kubernetes.yml
 [1]: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/

From 240ba8b35f6b8fc8326eca897f1ed7fbff64a2a9 Mon Sep 17 00:00:00 2001
From: Feroz Salam <feroz@argh.in>
Date: Mon, 5 Apr 2021 18:18:23 +0100
Subject: [PATCH 2/3] Update PR number

---
 rfcs/text/0012-orchestrator-field-set.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rfcs/text/0012-orchestrator-field-set.md b/rfcs/text/0012-orchestrator-field-set.md
index 4e5e3b9a2a..c702f790a1 100644
--- a/rfcs/text/0012-orchestrator-field-set.md
+++ b/rfcs/text/0012-orchestrator-field-set.md
@@ -256,7 +256,7 @@ The following are the people that consulted on the contents of this RFC.
 * Stage 0: https://github.com/elastic/ecs/pull/1209
 * Stage 1: https://github.com/elastic/ecs/pull/1230
 * Stage 2: https://github.com/elastic/ecs/pull/1299
-* Stage 3: 
+* Stage 3: https://github.com/elastic/ecs/pull/1343
 
 [0]: https://github.com/elastic/ecs/blob/master/use-cases/kubernetes.yml
 [1]: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/

From 74661b5abaa89581b1d303c480a1435954191962 Mon Sep 17 00:00:00 2001
From: Eric Beahan <eric.beahan@elastic.co>
Date: Fri, 14 May 2021 12:10:02 -0500
Subject: [PATCH 3/3] set advancement date for stage 3

---
 rfcs/text/0012-orchestrator-field-set.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rfcs/text/0012-orchestrator-field-set.md b/rfcs/text/0012-orchestrator-field-set.md
index c702f790a1..3796a34908 100644
--- a/rfcs/text/0012-orchestrator-field-set.md
+++ b/rfcs/text/0012-orchestrator-field-set.md
@@ -1,7 +1,7 @@
 # 0012: Orchestrator field set creation
 
 - Stage: **3 (finished)** <!-- Update to reflect target stage. See https://elastic.github.io/ecs/stages.html -->
-- Date: **2021-03-26** <!-- The ECS team sets this date at merge time. This is the date of the latest stage advancement. -->
+- Date: **2021-05-14** <!-- The ECS team sets this date at merge time. This is the date of the latest stage advancement. -->
 
 There is currently no ECS field set for container orchestration engines. There is an example of an ECS
 [use-case][0] for Kubernetes, but it largely relies on other ECS field sets, and doesn't cover all of the