From 2a4c3e995eec94c19af5f85214a5daf3ffd34fdd Mon Sep 17 00:00:00 2001
From: Joshua Eason <josheason@seed-innovations.com>
Date: Mon, 26 Oct 2020 14:38:45 +0000
Subject: [PATCH 1/3] Removing CC lines in issue templates

---
 .gitlab/issue_templates/Application - Archive.md | 3 +--
 .gitlab/issue_templates/Application - Initial.md | 3 +--
 .gitlab/issue_templates/Application - Update.md  | 3 +--
 .gitlab/issue_templates/Bug.md                   | 3 +--
 .gitlab/issue_templates/Feature Request.md       | 3 +--
 .gitlab/issue_templates/New Findings.md          | 3 +--
 .gitlab/issue_templates/Pipeline Failure.md      | 3 +--
 README.md                                        | 2 +-
 8 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitlab/issue_templates/Application - Archive.md b/.gitlab/issue_templates/Application - Archive.md
index 9f3b5fe..a558faa 100644
--- a/.gitlab/issue_templates/Application - Archive.md	
+++ b/.gitlab/issue_templates/Application - Archive.md	
@@ -17,5 +17,4 @@ Requesting this application be archived due to one of the following reasons:
 - [ ] Iron Bank frontend no longer lists application as available or approved
 
 
-/label ~"Container::Archive"
-/cc @ironbank-notifications/archive
\ No newline at end of file
+/label ~"Container::Archive"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Application - Initial.md b/.gitlab/issue_templates/Application - Initial.md
index 6594a05..b7acebd 100644
--- a/.gitlab/issue_templates/Application - Initial.md	
+++ b/.gitlab/issue_templates/Application - Initial.md	
@@ -28,5 +28,4 @@ Approval Process (container hardening team processes):
 
 
 
-/label ~"Container::Initial"
-/cc @ironbank-notifications/cht
\ No newline at end of file
+/label ~"Container::Initial"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md
index caebb3e..d95cb35 100644
--- a/.gitlab/issue_templates/Application - Update.md	
+++ b/.gitlab/issue_templates/Application - Update.md	
@@ -31,5 +31,4 @@ Approval Process:
 
 
 
-/label ~"Container::Update"
-/cc @ironbank-notifications/updates
\ No newline at end of file
+/label ~"Container::Update"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 1427a0c..2030c24 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -33,5 +33,4 @@ logs, and code as it's very hard to read otherwise.)
 - [ ] Bug has been identified and corrected within the container
 
 
-/label ~Bug
-/cc @ironbank-notifications/bug
\ No newline at end of file
+/label ~Bug
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md
index a0e2f19..94aea9a 100644
--- a/.gitlab/issue_templates/Feature Request.md	
+++ b/.gitlab/issue_templates/Feature Request.md	
@@ -28,5 +28,4 @@
 - [ ] Feature has been implemented
 
 
-/label ~Feature
-/cc @ironbank-notifications/feature
\ No newline at end of file
+/label ~Feature
\ No newline at end of file
diff --git a/.gitlab/issue_templates/New Findings.md b/.gitlab/issue_templates/New Findings.md
index 068d029..1fd613d 100644
--- a/.gitlab/issue_templates/New Findings.md	
+++ b/.gitlab/issue_templates/New Findings.md	
@@ -16,5 +16,4 @@ Approval Process:
 
 
 
-/label ~"Container::New Findings"
-/cc @ironbank-notifications/security
\ No newline at end of file
+/label ~"Container::New Findings"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Pipeline Failure.md b/.gitlab/issue_templates/Pipeline Failure.md
index 28b82a9..dd6ab98 100644
--- a/.gitlab/issue_templates/Pipeline Failure.md	
+++ b/.gitlab/issue_templates/Pipeline Failure.md	
@@ -27,5 +27,4 @@
 - [ ] Pipeline failure has been resolved
 
 
-/label ~Pipeline
-/cc @ironbank-notifications/pipelines
\ No newline at end of file
+/label ~Pipeline
\ No newline at end of file
diff --git a/README.md b/README.md
index f2a2b88..5dc6fa6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# master-project-template
+# <application name>
 
 Project template for all Iron Bank container repositories.
\ No newline at end of file
-- 
GitLab


From fb4c993c0c29da108d218f708cc200aa95af9514 Mon Sep 17 00:00:00 2001
From: Al Fontaine <alan.fontaine@centauricorp.com>
Date: Mon, 26 Oct 2020 15:35:38 +0000
Subject: [PATCH 2/3] Update Application - Update.md

---
 .gitlab/issue_templates/Application - Update.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md
index d95cb35..15567be 100644
--- a/.gitlab/issue_templates/Application - Update.md	
+++ b/.gitlab/issue_templates/Application - Update.md	
@@ -19,6 +19,9 @@ Hardening:
 - [ ] Container version has been updated in greylist file
 - [ ] Branch has been merged into `development`
 
+No new findings:
+- [ ] There are no new findings in this update. Skip the Justifications and Approval Process steps and apply the label ~"Approval".
+
 Justifications:
 - [ ] All findings have been justified per the above documentation
 - [ ] Justifications have been provided to the container hardening team
-- 
GitLab


From 47fb5fed959b42bca53025846a9dcee92a692ac3 Mon Sep 17 00:00:00 2001
From: Joshua Eason <josheason@seed-innovations.com>
Date: Thu, 10 Dec 2020 22:39:47 +0000
Subject: [PATCH 3/3] Update issue templates

---
 .gitlab/issue_templates/Access Request.md     |  3 ++
 .../issue_templates/Application - Archive.md  |  3 ++
 .../issue_templates/Application - Initial.md  | 54 +++++++++++++++++--
 .../issue_templates/Application - Update.md   | 51 ++++++++++++++++--
 .gitlab/issue_templates/Bug.md                |  5 ++
 .gitlab/issue_templates/Feature Request.md    |  5 ++
 .../issue_templates/Leadership Question.md    |  5 ++
 .gitlab/issue_templates/New Findings.md       |  8 +++
 .../issue_templates/Onboarding Question.md    |  5 ++
 .gitlab/issue_templates/Pipeline Failure.md   |  6 +++
 10 files changed, 137 insertions(+), 8 deletions(-)

diff --git a/.gitlab/issue_templates/Access Request.md b/.gitlab/issue_templates/Access Request.md
index 1a7b224..2e3e8b7 100644
--- a/.gitlab/issue_templates/Access Request.md	
+++ b/.gitlab/issue_templates/Access Request.md	
@@ -13,4 +13,7 @@ The access level should be:
 - [ ] All accounts have been provided the necessary accesses
 
 
+
+
+
 /label ~"Access" ~"To Do"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Application - Archive.md b/.gitlab/issue_templates/Application - Archive.md
index a558faa..0304276 100644
--- a/.gitlab/issue_templates/Application - Archive.md	
+++ b/.gitlab/issue_templates/Application - Archive.md	
@@ -17,4 +17,7 @@ Requesting this application be archived due to one of the following reasons:
 - [ ] Iron Bank frontend no longer lists application as available or approved
 
 
+
+
+
 /label ~"Container::Archive"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Application - Initial.md b/.gitlab/issue_templates/Application - Initial.md
index b7acebd..7ddab91 100644
--- a/.gitlab/issue_templates/Application - Initial.md	
+++ b/.gitlab/issue_templates/Application - Initial.md	
@@ -7,25 +7,69 @@ Requesting application to be hardened. This is only for initial hardening of a c
 
 Current version: (State the current version of the application as you see it)
 
-Under support: (Is the updated version within the same major version of the application or is this a new major version?)
+## Communication
+
+All communication should occur through this issue. This ensures that all information is documented in a centralized location and also ensures that all of the assignees are notified of updates. It is imperative that all required parties are listed as assignees of this issue and that individuals are not removed. Please do not remove anyone from the assignee list.
+
+If you need to contact the Container Hardening team, please identify your assigned point of contact. You can find your point of contact by:
+1. They should be listed as an assignee on this ticket
+2. They should be listed in the `hardening_manifest.yaml` file under the `maintainers` section with a field of `cht_member: true`
+
+If you have no assignee, feel free to tag Container Hardening leadership in your issue by commenting on this issue with your questions/concerns and then add `/cc @ironbank-notifications/leadership`. Gitlab will automatically notify all Container Hardening leadership to look at this issue and respond.
+
+
+## Responsibilities
+
+If this application is owned by a Contributor or Vendor (identifed as `Owner::Contributor` and `Owner::Vendor` respectively), then it is your responsibility to drive this issue through completion. This means that the Container Hardening team is not here to help push any deadlines/timeframes you may have with other customers or DoD agencies. If you have issues with the activity, you may notify Container Hardening leadership above. Do not change the ownership labels.
 
 
 ## Definition of Done
+
 Hardening:
-- [ ] Container builds successfully
-- [ ] Greylist file has been created (requires a member from container hardening)
+- [ ] Hardening manifest is created and adheres to the schema (https://repo1.dsop.io/ironbank-tools/ironbank-pipeline/-/blob/master/schema/hardening_manifest.schema.json)
+- [ ] Container builds successfully through the Gitlab CI pipeline
 - [ ] Branch has been merged into `development`
+- [ ] Project is configured for automatic renovate updates (if possible)
 
 Justifications:
 - [ ] All findings have been justified per the above documentation
-- [ ] Justifications have been provided to the container hardening team
+- [ ] Justifications have been attached to this issue
+- [ ] Apply the label `Approval` to indicate this container is ready for the approval phase
+
+Note: The justifications must be provided in a timely fashion. Failure to do so could result in new findings being identified which may start this process over.
 
-Approval Process (container hardening team processes):
+Approval Process (Container Hardening Team processes):
 - [ ] Peer review from Container Hardening Team
 - [ ] Findings Approver has reviewed and approved all justifications
 - [ ] Approval request has been sent to Authorizing Official
 - [ ] Approval request has been processed by Authorizing Official
 
+Note: If the above approval process is kicked back for any reason, the `Approval` label will be removed and the issue will be sent back to `Open`. Any comments will be listed in this issue for you to address. Once they have been addressed, you may re-add the `Approval` label.
+
+## Post Approval
+
+### Continuous Monitoring
+
+Once a container is approved, the `Approved` label will be applied to this issue and it will be closed. You will be able to find your applications on http://ironbank.dsop.io and https://registry1.dsop.io.
+
+In addition to the above, your application will now be subscribed to continuous monitoring. This means that any new findings discovered as part of this will need justifications. To satisfy this process, any new findings will trigger a new Gitlab issue in this project with the label `Container::New Findings`. All members listed in the `maintainers` section of the `hardening_manifest.yaml` file will automatically be assigned. It is your responsibility as a Contributor or Vendor to monitor for this and provide justifications in a timely fashion. This newly created issue will have all the instructions necessary to complete the process. Failure to provide justifications could result in the revocation of the application's approval status.
+
+### Updates
+
+It is imperative that application updates be submitted as quickly as possible. We do not want applications to become stale. To help with this process, Ironbank recommends using a tool called [Renovate](https://github.com/renovatebot/renovate). This requires a `renovate.json` file to be placed in your project and can automate the creation of issues and merge requests.
+
+If not using Renovate, it will be up to you as a Contributor or Vendor to keep this image up-to-date at all times. When you wish to submit an application update, you must create a new issue in this project using the `Application - Update` template and associate it with the corresponding merge request. If you submit a merge request alone, work will not proceed until a related issue is created. These issues are tracked using the label `Container::Update`.
+
+Additionally, it is imperative that all updates must be followed through to completion. Simply submitting an application update but not following through on justifications and approvals does not suffice and risk your application's approval status being revoked.
+
+### Bugs
+
+Occassionally, users may file bug reports for your application. It is your responsibility to monitor for these since they are created inside your project repository. Assignees will automatically be populated by the `members` section of the `hardening_manifest.yaml` file and will have the label `Bug`.
+
+
+
+
+
 
 
 /label ~"Container::Initial"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md
index 15567be..569e75d 100644
--- a/.gitlab/issue_templates/Application - Update.md	
+++ b/.gitlab/issue_templates/Application - Update.md	
@@ -13,18 +13,38 @@ Updated version: (State the version you would like the application updated to)
 Under support: (Is the updated version within the same major version of the application or is this a new major version?)
 
 
+## Communication
+
+All communication should occur through this issue. This ensures that all information is documented in a centralized location and also ensures that all of the assignees are notified of updates. It is imperative that all required parties are listed as assignees of this issue and that individuals are not removed. Please do not remove anyone from the assignee list.
+
+If you need to contact the Container Hardening team, please identify your assigned point of contact. You can find your point of contact by:
+1. They should be listed as an assignee on this ticket
+2. They should be listed in the `hardening_manifest.yaml` file under the `maintainers` section with a field of `cht_member: true`
+
+If you have no assignee, feel free to tag Container Hardening leadership in your issue by commenting on this issue with your questions/concerns and then add `/cc @ironbank-notifications/leadership`. Gitlab will automatically notify all Container Hardening leadership to look at this issue and respond.
+
+
+## Responsibilities
+
+If this application is owned by a Contributor or Vendor (identifed as `Owner::Contributor` and `Owner::Vendor` respectively), then it is your responsibility to drive this issue through completion. This means that the Container Hardening team is not here to help push any deadlines/timeframes you may have with other customers or DoD agencies. If you have issues with the activity, you may notify Container Hardening leadership above. Do not change the ownership labels.
+
+
 ## Definition of Done
 Hardening:
-- [ ] Container builds successfully
-- [ ] Container version has been updated in greylist file
+- [ ] Hardening manifest has been updated and adheres to the schema (https://repo1.dsop.io/ironbank-tools/ironbank-pipeline/-/blob/master/schema/hardening_manifest.schema.json)
+- [ ] Container builds successfully throughthe Gitlab CI pipeline
 - [ ] Branch has been merged into `development`
+- [ ] Project is configured for automatic renovate updates (if possible)
 
 No new findings:
-- [ ] There are no new findings in this update. Skip the Justifications and Approval Process steps and apply the label ~"Approval".
+- [ ] There are no new findings in this update. Skip the Justifications and Approval Process steps and apply the label `Approval`
 
 Justifications:
 - [ ] All findings have been justified per the above documentation
 - [ ] Justifications have been provided to the container hardening team
+- [ ] Skip the Justifications and Approval Process steps and apply the label `Approval`
+
+Note: The justifications must be provided in a timely fashion. Failure to do so could result in new findings being identified which may start this process over.
 
 Approval Process:
 - [ ] Peer review from Container Hardening Team
@@ -32,6 +52,31 @@ Approval Process:
 - [ ] Approval request has been sent to Authorizing Official
 - [ ] Approval request has been processed by Authorizing Official
 
+Note: If the above approval process is kicked back for any reason, the `Approval` label will be removed and the issue will be sent back to `Open`. Any comments will be listed in this issue for you to address. Once they have been addressed, you may re-add the `Approval` label.
+
+
+## Post Approval
+
+### Continuous Monitoring
+
+Once a container is approved, the `Approved` label will be applied to this issue and it will be closed. You will be able to find your applications on http://ironbank.dsop.io and https://registry1.dsop.io.
+
+In addition to the above, your application will now be subscribed to continuous monitoring. This means that any new findings discovered as part of this will need justifications. To satisfy this process, any new findings will trigger a new Gitlab issue in this project with the label `Container::New Findings`. All members listed in the `maintainers` section of the `hardening_manifest.yaml` file will automatically be assigned. It is your responsibility as a Contributor or Vendor to monitor for this and provide justifications in a timely fashion. This newly created issue will have all the instructions necessary to complete the process. Failure to provide justifications could result in the revocation of the application's approval status.
+
+### Updates
+
+It is imperative that application updates be submitted as quickly as possible. We do not want applications to become stale. To help with this process, Ironbank recommends using a tool called [Renovate](https://github.com/renovatebot/renovate). This requires a `renovate.json` file to be placed in your project and can automate the creation of issues and merge requests.
+
+If not using Renovate, it will be up to you as a Contributor or Vendor to keep this image up-to-date at all times. When you wish to submit an application update, you must create a new issue in this project using the `Application - Update` template and associate it with the corresponding merge request. If you submit a merge request alone, work will not proceed until a related issue is created. These issues are tracked using the label `Container::Update`.
+
+Additionally, it is imperative that all updates must be followed through to completion. Simply submitting an application update but not following through on justifications and approvals does not suffice and risk your application's approval status being revoked.
+
+### Bugs
+
+Occassionally, users may file bug reports for your application. It is your responsibility to monitor for these since they are created inside your project repository. Assignees will automatically be populated by the `members` section of the `hardening_manifest.yaml` file and will have the label `Bug`.
+
+
+
 
 
 /label ~"Container::Update"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 2030c24..069eaf0 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -33,4 +33,9 @@ logs, and code as it's very hard to read otherwise.)
 - [ ] Bug has been identified and corrected within the container
 
 
+
+
+
+
+
 /label ~Bug
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md
index 94aea9a..aad0671 100644
--- a/.gitlab/issue_templates/Feature Request.md	
+++ b/.gitlab/issue_templates/Feature Request.md	
@@ -28,4 +28,9 @@
 - [ ] Feature has been implemented
 
 
+
+
+
+
+
 /label ~Feature
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Leadership Question.md b/.gitlab/issue_templates/Leadership Question.md
index 4674f82..b2cf9e5 100644
--- a/.gitlab/issue_templates/Leadership Question.md	
+++ b/.gitlab/issue_templates/Leadership Question.md	
@@ -3,5 +3,10 @@
 (Detailed description of the question you'd like to ask the leadership team)
 
 
+
+
+
+
+
 /label ~"Question::Leadership" ~"To Do"
 /cc @ironbank-notifications/leadership
\ No newline at end of file
diff --git a/.gitlab/issue_templates/New Findings.md b/.gitlab/issue_templates/New Findings.md
index 1fd613d..867f832 100644
--- a/.gitlab/issue_templates/New Findings.md	
+++ b/.gitlab/issue_templates/New Findings.md	
@@ -8,12 +8,20 @@ Container has new findings discovered during continuous monitoring.
 Justifications:
 - [ ] All findings have been justified
 - [ ] Justifications have been provided to the container hardening team
+- [ ] `Approval` label has been applied
+
+Note: The justifications must be provided in a timely fashion. Failure to do so could result in new findings being identified which may start this process over.
 
 Approval Process:
 - [ ] Findings Approver has reviewed and approved all justifications
 - [ ] Approval request has been sent to Authorizing Official
 - [ ] Approval request has been processed by Authorizing Official
 
+Note: If the above approval process is kicked back for any reason, the `Approval` label will be removed and the issue will be sent back to `Open`. Any comments will be listed in this issue for you to address. Once they have been addressed, you may re-add the `Approval` label.
+
+
+
+
 
 
 /label ~"Container::New Findings"
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Onboarding Question.md b/.gitlab/issue_templates/Onboarding Question.md
index 77dea11..ae8011e 100644
--- a/.gitlab/issue_templates/Onboarding Question.md	
+++ b/.gitlab/issue_templates/Onboarding Question.md	
@@ -3,5 +3,10 @@
 (Detailed description of the question you'd like to ask the onboarding team)
 
 
+
+
+
+
+
 /label ~"Question::Onboarding" ~"To Do"
 /cc @ironbank-notifications/onboarding
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Pipeline Failure.md b/.gitlab/issue_templates/Pipeline Failure.md
index dd6ab98..36aa982 100644
--- a/.gitlab/issue_templates/Pipeline Failure.md	
+++ b/.gitlab/issue_templates/Pipeline Failure.md	
@@ -27,4 +27,10 @@
 - [ ] Pipeline failure has been resolved
 
 
+
+
+
+
+
+
 /label ~Pipeline
\ No newline at end of file
-- 
GitLab