Improve release issue with code freeze step

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>

Author: frouioui

go/cmd/cmd.go

@@ -52,7 +52,7 @@ var (
 			// is made here, perhaps there is a better way of doing it
 			state.LoadIssue()
 
-			interactive.MainScreen(ctx)
+			interactive.MainScreen(ctx, state)
 		},
 	}
 )

go/interactive/main_menu.go

@@ -33,7 +33,7 @@ func blankLineMenu() *ui.MenuItem {
 	return &ui.MenuItem{}
 }
 
-func MainScreen(ctx context.Context) {
+func MainScreen(ctx context.Context, state *releaser.State) {
 	prereqMenu := ui.NewMenu(
 		ctx,
 		"Prerequisites",
@@ -44,15 +44,20 @@ func MainScreen(ctx context.Context) {
 		requestCrossPostBlogPostMenuItem(ctx),
 	)
 
-	preReleaseMenu := ui.NewMenu(
+	codeFreezeMenu := ui.NewMenu(
 		ctx,
-		"Pre Release",
+		"Code Freeze",
 		pre_release.CodeFreezeMenuItem(ctx),
 		pre_release.CopyBranchProtectionMenuItem(ctx),
 		pre_release.CreateBackportToLabelMenuItem(ctx),
 		pre_release.UpdateSnapshotOnMainMenuItem(ctx),
-		pre_release.CreateReleasePRMenuItem(ctx),
 		pre_release.CreateMilestoneMenuItem(ctx),
+	)
+
+	preReleaseMenu := ui.NewMenu(
+		ctx,
+		"Pre Release",
+		pre_release.CreateReleasePRMenuItem(ctx),
 		pre_release.VtopCreateBranchMenuItem(ctx),
 		pre_release.VtopBumpMainVersionMenuItem(ctx),
 		pre_release.VtopUpdateGolangMenuItem(ctx),
@@ -98,6 +103,13 @@ func MainScreen(ctx context.Context) {
 			Name:     "Prerequisites",
 			Act:      subMenu(prereqMenu),
 		},
+		&ui.MenuItem{
+			IsDone:   codeFreezeMenu.Done(),
+			SubItems: codeFreezeMenu.Items,
+			Name:     "Code Freeze",
+			Act:      subMenu(codeFreezeMenu),
+			Ignore:   state.Issue.RC > 1 || state.Issue.GA,
+		},
 		&ui.MenuItem{
 			IsDone:   preReleaseMenu.Done(),
 			SubItems: preReleaseMenu.Items,

go/interactive/pre_release/create_github_milestones.go

@@ -41,6 +41,7 @@ func CreateMilestoneMenuItem(ctx context.Context) *ui.MenuItem {
 		Update: createMilestoneUpdate,
 		Info:   state.Issue.NewGitHubMilestone.URL,
 		IsDone: state.Issue.NewGitHubMilestone.Done,
+
 		// If we are releasing RC2 or above, we do not want to create a milestone again
 		Ignore: state.Issue.RC >= 2,
 	}

go/releaser/issue.go

@@ -179,6 +179,7 @@ const (
 {{- if .DoVtOp }}
 > The release of vitess-operator **v{{.VtopRelease}}** is also planned.
 {{- end }}
+> Release team: @vitessio/release
 
 > [!IMPORTANT]  
 > Please **do not** edit the content of the Issue's body manually.
@@ -210,12 +211,13 @@ const (
 - [{{fmtStatus .RequestCrossPostBlogPost}}] Send requests to cross-post the blog post (CNCF, PlanetScale).
 {{- end }}
 
-{{- if eq .RC 1}}
-### Code Freeze _(1 week before RC-1)_
+{{- if not (or (gt .RC 1) (.GA))}}
+### Code Freeze {{if eq .RC 1}}_(1 week before)_{{else}}_(~1-3 days before)_{{end}}
 - [{{fmtStatus .CodeFreeze.Done}}] Code Freeze.
 {{- if .CodeFreeze.URL }}
   - {{ .CodeFreeze.URL }}
 {{- end }}
+{{- if eq .RC 1 }}
 - [{{fmtStatus .CopyBranchProtectionRules}}] Copy branch protection rules.
 - [{{fmtStatus .CreateBackportToLabel.Done}}] Create the Backport to labels.
 {{- if .CreateBackportToLabel.URL }}
@@ -225,6 +227,7 @@ const (
 {{- if .UpdateSnapshotOnMain.URL }}
   - {{ .UpdateSnapshotOnMain.URL }}
 {{- end }}
+{{- end }}
 - [{{fmtStatus .NewGitHubMilestone.Done}}] Create new GitHub Milestone.
 {{- if .NewGitHubMilestone.URL }}
   - {{ .NewGitHubMilestone.URL }}
@@ -233,12 +236,6 @@ const (
 
 ### Pre-Release _(~1-3 days before)_
 
-{{- if not (or (gt .RC 0) (.GA)) }} 
-- [{{fmtStatus .CodeFreeze.Done}}] Code Freeze.
-{{- if .CodeFreeze.URL }}
-  - {{ .CodeFreeze.URL }}
-{{- end }}
-{{- end }}
 - [{{fmtStatus .CreateReleasePR.Done}}] Create Release PR.
 {{- if .CreateReleasePR.URL }}
   - {{ .CreateReleasePR.URL }}
@@ -263,7 +260,7 @@ const (
 - [{{fmtStatus .CreateBlogPostPR}}] Open a Pull Request on the website repository for the blog post.
 {{- end }}
 
-### Release _(day of)_
+### Release _({{fmtShortDate .Date }})_
 
 - [{{fmtStatus .MergeReleasePR.Done}}] Merge the Release PR.
 {{- if .MergeReleasePR.URL }}
@@ -315,7 +312,7 @@ const (
 {{- end }}
 
 
-### Post-Release
+### Post-Release _({{fmtShortDate .Date }})_
 - [{{fmtStatus .SlackPostRelease}}] Notify the community on Slack for the new release.
 - [{{fmtStatus .Twitter}}] Twitter announcement.
 - [{{fmtStatus .CloseIssue}}] Close this Issue.
@@ -639,6 +636,9 @@ func (i *Issue) toString() string {
 		"fmtDate": func(d time.Time) string {
 			return d.Format("Mon _2 Jan 2006")
 		},
+		"fmtShortDate": func(d time.Time) string {
+			return d.Format("Mon _2 Jan")
+		},
 	})
 
 	parsed, err := tmpl.Parse(releaseIssueTemplate)