diff --git a/cmd/krel/cmd/changelog_data_test.go b/cmd/krel/cmd/changelog_data_test.go index 3f2c573a527..9201c7635a6 100644 --- a/cmd/krel/cmd/changelog_data_test.go +++ b/cmd/krel/cmd/changelog_data_test.go @@ -32,7 +32,7 @@ const patchReleaseExpectedContent = `## Changes by Kind - Removed dependency on test/e2e/common from test/e2e/storage/testsuites ([#83776](https://github.com/kubernetes/kubernetes/pull/83776), [@avalluri](https://github.com/avalluri)) [SIG Testing] -### Other (Bug, Cleanup or Flake) +### Bug or Regression - Add data cache flushing during unmount device for GCE-PD driver in Windows Server. ([#83591](https://github.com/kubernetes/kubernetes/pull/83591), [@jingxu97](https://github.com/jingxu97)) [SIG Storage and Windows] - Adds a metric apiserver_request_error_total to kube-apiserver. This metric tallies the number of request_errors encountered by verb, group, version, resource, subresource, scope, component, and code. ([#83427](https://github.com/kubernetes/kubernetes/pull/83427), [@logicalhan](https://github.com/logicalhan)) [SIG API Machinery and Instrumentation] @@ -84,7 +84,7 @@ const patchReleaseExpectedHTML = ` -

Other (Bug, Cleanup or Flake)

+

Bug or Regression

-

Other (Bug, Cleanup or Flake)

+

Bug or Regression

+

Other (Cleanup or Flake)

+ diff --git a/pkg/notes/document/document.go b/pkg/notes/document/document.go index a993de20efa..a273bb3fcb8 100644 --- a/pkg/notes/document/document.go +++ b/pkg/notes/document/document.go @@ -172,9 +172,10 @@ const ( KindFailingTest Kind = "failing-test" KindFeature Kind = "feature" KindFlake Kind = "flake" + KindRegression Kind = "regression" // TODO: These should be same case as the others. Probably fix up prettyKind()?? - KindBugCleanupFlake Kind = "Other (Bug, Cleanup or Flake)" - KindUncategorized Kind = "Uncategorized" + KindOther Kind = "Other (Cleanup or Flake)" + KindUncategorized Kind = "Uncategorized" ) var kindPriority = []Kind{ @@ -185,16 +186,17 @@ var kindPriority = []Kind{ KindDocumentation, KindFailingTest, KindBug, + KindRegression, KindCleanup, KindFlake, - KindBugCleanupFlake, + KindOther, KindUncategorized, } var kindMap = map[Kind]Kind{ - KindBug: KindBugCleanupFlake, - KindCleanup: KindBugCleanupFlake, - KindFlake: KindBugCleanupFlake, + KindRegression: KindBug, + KindCleanup: KindOther, + KindFlake: KindOther, } // CreateDocument assembles an organized document from an unorganized set of @@ -476,8 +478,10 @@ func prettyKind(kind Kind) string { return "API Change" } else if kind == KindFailingTest { return "Failing Test" - } else if kind == KindBugCleanupFlake { - return string(KindBugCleanupFlake) + } else if kind == KindBug { + return "Bug or Regression" + } else if kind == KindOther { + return string(KindOther) } return strings.Title(string(kind)) } diff --git a/pkg/notes/document/document_test.go b/pkg/notes/document/document_test.go index 48100a0f5b3..d0665d3cc92 100644 --- a/pkg/notes/document/document_test.go +++ b/pkg/notes/document/document_test.go @@ -162,7 +162,7 @@ func TestRenderMarkdownTemplateGoldenFile(t *testing.T) { NoteCategory{Kind: KindFailingTest, NoteEntries: &Notes{"Please run presubmit test!"}}, NoteCategory{Kind: KindFeature, NoteEntries: &Notes{"This will get you promoted."}}, NoteCategory{Kind: KindFlake, NoteEntries: &Notes{"This *should* get you promoted."}}, - NoteCategory{Kind: KindBugCleanupFlake, NoteEntries: &Notes{"This should definitely get you promoted."}}, + NoteCategory{Kind: KindOther, NoteEntries: &Notes{"This should definitely get you promoted."}}, NoteCategory{Kind: KindUncategorized, NoteEntries: &Notes{"Someone somewhere did the world a great justice."}}, }, PreviousRevision: "v1.16.0", @@ -314,17 +314,18 @@ filename | sha512 hash func TestSortKinds(t *testing.T) { input := NotesByKind{ - "cleanup": nil, - "api-change": nil, - "deprecation": nil, - "documentation": nil, - "Other (Bug, Cleanup or Flake)": nil, - "failing-test": nil, - "design": nil, - "flake": nil, - "bug": nil, - "feature": nil, - "Uncategorized": nil, + "cleanup": nil, + "api-change": nil, + "deprecation": nil, + "documentation": nil, + "Other (Cleanup or Flake)": nil, + "failing-test": nil, + "design": nil, + "flake": nil, + "bug": nil, + "regression": nil, + "feature": nil, + "Uncategorized": nil, } res := sortKinds(input) require.Equal(t, res, kindPriority) diff --git a/pkg/notes/document/testdata/document.md.golden b/pkg/notes/document/testdata/document.md.golden index b20aeb0c475..bbbf9ea044b 100644 --- a/pkg/notes/document/testdata/document.md.golden +++ b/pkg/notes/document/testdata/document.md.golden @@ -63,7 +63,7 @@ filename | sha512 hash ### API Change - This might make people sad...or happy. -### Bug +### Bug or Regression - This will likely get you promoted. ### Cleanup - This usually does not get you promoted but it should. @@ -79,7 +79,7 @@ filename | sha512 hash - This will get you promoted. ### Flake - This *should* get you promoted. -### Other (Bug, Cleanup or Flake) +### Other (Cleanup or Flake) - This should definitely get you promoted. ### Uncategorized - Someone somewhere did the world a great justice. \ No newline at end of file diff --git a/pkg/notes/document/testdata/document_without_downloads.md.golden b/pkg/notes/document/testdata/document_without_downloads.md.golden index 8db63b89d8e..5f41eaa4a0e 100644 --- a/pkg/notes/document/testdata/document_without_downloads.md.golden +++ b/pkg/notes/document/testdata/document_without_downloads.md.golden @@ -14,7 +14,7 @@ ### API Change - This might make people sad...or happy. -### Bug +### Bug or Regression - This will likely get you promoted. ### Cleanup - This usually does not get you promoted but it should. @@ -30,7 +30,7 @@ - This will get you promoted. ### Flake - This *should* get you promoted. -### Other (Bug, Cleanup or Flake) +### Other (Cleanup or Flake) - This should definitely get you promoted. ### Uncategorized - Someone somewhere did the world a great justice. \ No newline at end of file