Merge pull request #6358 from cblecker/ar-gen-followup

Annual Report generator followup

3 files changed, 26 insertions, 7 deletions

diff --git a/generator/README.md b/generator/README.md
index de68d18e..787dabd3 100644
--- a/generator/README.md
+++ b/generator/README.md
@@ -67,6 +67,23 @@ make WHAT=container-identity
 
 where the `WHAT` var refers to the directory being built.
 
+
+To generate the annual report template for a specific year:
+
+```bash
+make ANNUAL_REPORT=true
+```
+
+This will generate the annual report template for the previous year, as well as
+drop GitHub issue templates into the `generator/generated/` directory.
+
+You can generate the issues from these templates by running:
+
+```bash
+ls -1 generator/generated/*.md | xargs -L1 hub issue create -F
+```
+
+
 ## Adding custom content
 
 ### README
diff --git a/generator/annual-report/github_issue.tmpl b/generator/annual-report/github_issue.tmpl
index 8a1048eb..0c5b44df 100644
--- a/generator/annual-report/github_issue.tmpl
+++ b/generator/annual-report/github_issue.tmpl
@@ -14,11 +14,13 @@ Actions for the chair/organizer of the community group:
 Once all the above items are complete, this issue may be `/close`'d
 
 Key dates:
-- Initial PR to communtiy repo should be opened by March 1st, {{now.UTC.Year}}
-- PR should be reviewed and merged by April 1st, {{now.UTC.Year}}
+- Initial PR to communtiy repo should be opened by February 14, {{now.UTC.Year}}
+- PR should be reviewed and merged by March 1st, {{now.UTC.Year}}
 
 More detailed information on the annual reports process is available [here](https://git.k8s.io/community/committee-steering/governance/annual-reports.md).
 
+Your group's report template is available here: https://git.k8s.io/community/{{.Dir}}/annual-report-{{lastYear}}.md
+
 If you have any questions or concerns about this process, you may reach the Steering Committee via the following methods:
 - Slack/E-mail your liaison directly
 - The public #steering-committee channel in Slack
diff --git a/generator/annual-report/sig_report.tmpl b/generator/annual-report/sig_report.tmpl
index 53607f8e..fb5443f5 100644
--- a/generator/annual-report/sig_report.tmpl
+++ b/generator/annual-report/sig_report.tmpl
@@ -17,7 +17,7 @@
 3. KEP work in {{lastYear}} (1.x, 1.y, 1.z):
 
 <!--
-Generated from kubernetes/enhancements kep.yaml files
+In future, this will be generated from kubernetes/enhancements kep.yaml files
 1. with SIG as owning-sig or in participating-sigs
 2. listing 1.x, 1.y, or 1.z in milestones or in latest-milestone
 -->
@@ -75,15 +75,15 @@ Generated from kubernetes/enhancements kep.yaml files
 - Primary mailing list member count:
 - Primary meeting attendee count (estimated, if needed):
 - Primary meeting participant count (estimated, if needed):
-- Unique reviewers for SIG-owned packages: {generated from OWNERS files referenced from subprojects, expanded with OWNERS_ALIASES files}
-- Unique approvers for SIG-owned packages: {generated from OWNERS files referenced from subprojects, expanded with OWNERS_ALIASES files}
+- Unique reviewers for SIG-owned packages: <!-- in future, this will be generated from OWNERS files referenced from subprojects, expanded with OWNERS_ALIASES files -->
+- Unique approvers for SIG-owned packages: <!-- in future, this will be generated from OWNERS files referenced from subprojects, expanded with OWNERS_ALIASES files -->
 
 Include any other ways you measure group membership
 
 ## Subprojects
 
 <!--
-Generated from delta of sigs.yaml from $YYYY-01-01 to $YYYY-12-31
+In future, this will be generated from delta of sigs.yaml from $YYYY-01-01 to $YYYY-12-31
 Manually visible via `git diff HEAD@{$YYYY-01-01} HEAD@{$YYYY-12-31} -- $sig-id/README.md`
 -->
 
@@ -102,7 +102,7 @@ Continuing:
 ## Working groups
 
 <!--
-Generated from delta of sigs.yaml from $YYYY-01-01 to $YYYY-12-31
+In future, this will be generated from delta of sigs.yaml from $YYYY-01-01 to $YYYY-12-31
 Manually visible via `git diff HEAD@{$YYYY-01-01} HEAD@{$YYYY-12-31} -- $sig-id/README.md`
 -->