From a6b0eaecc99c07aef4952e8fae09642cabe4df5e Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Thu, 6 Feb 2020 00:17:04 -0500 Subject: [PATCH 1/3] CHANGELOG: Move changelogs into a subdir to delegate releng approvals Signed-off-by: Stephen Augustus --- CHANGELOG-1.10.md => CHANGELOG/CHANGELOG-1.10.md | 0 CHANGELOG-1.11.md => CHANGELOG/CHANGELOG-1.11.md | 0 CHANGELOG-1.12.md => CHANGELOG/CHANGELOG-1.12.md | 0 CHANGELOG-1.13.md => CHANGELOG/CHANGELOG-1.13.md | 0 CHANGELOG-1.14.md => CHANGELOG/CHANGELOG-1.14.md | 0 CHANGELOG-1.15.md => CHANGELOG/CHANGELOG-1.15.md | 0 CHANGELOG-1.16.md => CHANGELOG/CHANGELOG-1.16.md | 0 CHANGELOG-1.17.md => CHANGELOG/CHANGELOG-1.17.md | 0 CHANGELOG-1.18.md => CHANGELOG/CHANGELOG-1.18.md | 0 CHANGELOG-1.2.md => CHANGELOG/CHANGELOG-1.2.md | 0 CHANGELOG-1.3.md => CHANGELOG/CHANGELOG-1.3.md | 0 CHANGELOG-1.4.md => CHANGELOG/CHANGELOG-1.4.md | 0 CHANGELOG-1.5.md => CHANGELOG/CHANGELOG-1.5.md | 0 CHANGELOG-1.6.md => CHANGELOG/CHANGELOG-1.6.md | 0 CHANGELOG-1.7.md => CHANGELOG/CHANGELOG-1.7.md | 0 CHANGELOG-1.8.md => CHANGELOG/CHANGELOG-1.8.md | 0 CHANGELOG-1.9.md => CHANGELOG/CHANGELOG-1.9.md | 0 CHANGELOG/OWNERS | 11 +++++++++++ 18 files changed, 11 insertions(+) rename CHANGELOG-1.10.md => CHANGELOG/CHANGELOG-1.10.md (100%) rename CHANGELOG-1.11.md => CHANGELOG/CHANGELOG-1.11.md (100%) rename CHANGELOG-1.12.md => CHANGELOG/CHANGELOG-1.12.md (100%) rename CHANGELOG-1.13.md => CHANGELOG/CHANGELOG-1.13.md (100%) rename CHANGELOG-1.14.md => CHANGELOG/CHANGELOG-1.14.md (100%) rename CHANGELOG-1.15.md => CHANGELOG/CHANGELOG-1.15.md (100%) rename CHANGELOG-1.16.md => CHANGELOG/CHANGELOG-1.16.md (100%) rename CHANGELOG-1.17.md => CHANGELOG/CHANGELOG-1.17.md (100%) rename CHANGELOG-1.18.md => CHANGELOG/CHANGELOG-1.18.md (100%) rename CHANGELOG-1.2.md => CHANGELOG/CHANGELOG-1.2.md (100%) rename CHANGELOG-1.3.md => CHANGELOG/CHANGELOG-1.3.md (100%) rename CHANGELOG-1.4.md => CHANGELOG/CHANGELOG-1.4.md (100%) rename CHANGELOG-1.5.md => CHANGELOG/CHANGELOG-1.5.md (100%) rename CHANGELOG-1.6.md => CHANGELOG/CHANGELOG-1.6.md (100%) rename CHANGELOG-1.7.md => CHANGELOG/CHANGELOG-1.7.md (100%) rename CHANGELOG-1.8.md => CHANGELOG/CHANGELOG-1.8.md (100%) rename CHANGELOG-1.9.md => CHANGELOG/CHANGELOG-1.9.md (100%) create mode 100644 CHANGELOG/OWNERS diff --git a/CHANGELOG-1.10.md b/CHANGELOG/CHANGELOG-1.10.md similarity index 100% rename from CHANGELOG-1.10.md rename to CHANGELOG/CHANGELOG-1.10.md diff --git a/CHANGELOG-1.11.md b/CHANGELOG/CHANGELOG-1.11.md similarity index 100% rename from CHANGELOG-1.11.md rename to CHANGELOG/CHANGELOG-1.11.md diff --git a/CHANGELOG-1.12.md b/CHANGELOG/CHANGELOG-1.12.md similarity index 100% rename from CHANGELOG-1.12.md rename to CHANGELOG/CHANGELOG-1.12.md diff --git a/CHANGELOG-1.13.md b/CHANGELOG/CHANGELOG-1.13.md similarity index 100% rename from CHANGELOG-1.13.md rename to CHANGELOG/CHANGELOG-1.13.md diff --git a/CHANGELOG-1.14.md b/CHANGELOG/CHANGELOG-1.14.md similarity index 100% rename from CHANGELOG-1.14.md rename to CHANGELOG/CHANGELOG-1.14.md diff --git a/CHANGELOG-1.15.md b/CHANGELOG/CHANGELOG-1.15.md similarity index 100% rename from CHANGELOG-1.15.md rename to CHANGELOG/CHANGELOG-1.15.md diff --git a/CHANGELOG-1.16.md b/CHANGELOG/CHANGELOG-1.16.md similarity index 100% rename from CHANGELOG-1.16.md rename to CHANGELOG/CHANGELOG-1.16.md diff --git a/CHANGELOG-1.17.md b/CHANGELOG/CHANGELOG-1.17.md similarity index 100% rename from CHANGELOG-1.17.md rename to CHANGELOG/CHANGELOG-1.17.md diff --git a/CHANGELOG-1.18.md b/CHANGELOG/CHANGELOG-1.18.md similarity index 100% rename from CHANGELOG-1.18.md rename to CHANGELOG/CHANGELOG-1.18.md diff --git a/CHANGELOG-1.2.md b/CHANGELOG/CHANGELOG-1.2.md similarity index 100% rename from CHANGELOG-1.2.md rename to CHANGELOG/CHANGELOG-1.2.md diff --git a/CHANGELOG-1.3.md b/CHANGELOG/CHANGELOG-1.3.md similarity index 100% rename from CHANGELOG-1.3.md rename to CHANGELOG/CHANGELOG-1.3.md diff --git a/CHANGELOG-1.4.md b/CHANGELOG/CHANGELOG-1.4.md similarity index 100% rename from CHANGELOG-1.4.md rename to CHANGELOG/CHANGELOG-1.4.md diff --git a/CHANGELOG-1.5.md b/CHANGELOG/CHANGELOG-1.5.md similarity index 100% rename from CHANGELOG-1.5.md rename to CHANGELOG/CHANGELOG-1.5.md diff --git a/CHANGELOG-1.6.md b/CHANGELOG/CHANGELOG-1.6.md similarity index 100% rename from CHANGELOG-1.6.md rename to CHANGELOG/CHANGELOG-1.6.md diff --git a/CHANGELOG-1.7.md b/CHANGELOG/CHANGELOG-1.7.md similarity index 100% rename from CHANGELOG-1.7.md rename to CHANGELOG/CHANGELOG-1.7.md diff --git a/CHANGELOG-1.8.md b/CHANGELOG/CHANGELOG-1.8.md similarity index 100% rename from CHANGELOG-1.8.md rename to CHANGELOG/CHANGELOG-1.8.md diff --git a/CHANGELOG-1.9.md b/CHANGELOG/CHANGELOG-1.9.md similarity index 100% rename from CHANGELOG-1.9.md rename to CHANGELOG/CHANGELOG-1.9.md diff --git a/CHANGELOG/OWNERS b/CHANGELOG/OWNERS new file mode 100644 index 00000000000..da3c000a1f8 --- /dev/null +++ b/CHANGELOG/OWNERS @@ -0,0 +1,11 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + - sig-release-approvers + - release-engineering-approvers +reviewers: + - release-engineering-reviewers + +labels: + - sig/release + - area/release-eng From 0380aff70c489381f1b231e7d696f63a99132081 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Thu, 6 Feb 2020 00:27:37 -0500 Subject: [PATCH 2/3] CHANGELOG: Move changelog, soft-link to top-level, refresh listing Signed-off-by: Stephen Augustus --- CHANGELOG.md | 27 +-------------------------- CHANGELOG/README.md | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 26 deletions(-) mode change 100644 => 120000 CHANGELOG.md create mode 100644 CHANGELOG/README.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 1079efc83a4..00000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,26 +0,0 @@ -## Development release: - -- [CHANGELOG-1.17.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.17.md) - -## Current release: - -- [CHANGELOG-1.16.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.16.md) - -## Older releases: - -- [CHANGELOG-1.15.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.15.md) -- [CHANGELOG-1.14.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md) -- [CHANGELOG-1.13.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.13.md) -- [CHANGELOG-1.12.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.12.md) -- [CHANGELOG-1.11.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md) -- [CHANGELOG-1.10.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md) -- [CHANGELOG-1.9.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.9.md) -- [CHANGELOG-1.8.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.8.md) -- [CHANGELOG-1.7.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.7.md) -- [CHANGELOG-1.6.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.6.md) -- [CHANGELOG-1.5.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.5.md) -- [CHANGELOG-1.4.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.4.md) -- [CHANGELOG-1.3.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.3.md) -- [CHANGELOG-1.2.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.2.md) - -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/CHANGELOG.md?pixel)]() diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 120000 index 00000000000..766969a156e --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1 @@ +CHANGELOG/README.md \ No newline at end of file diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md new file mode 100644 index 00000000000..f6450c24cc9 --- /dev/null +++ b/CHANGELOG/README.md @@ -0,0 +1,29 @@ +# CHANGELOGs + +## Development release + +- [CHANGELOG-1.18.md](./CHANGELOG-1.18.md) + +## Current release + +- [CHANGELOG-1.17.md](./CHANGELOG-1.17.md) + +## Older releases + +- [CHANGELOG-1.16.md](./CHANGELOG-1.16.md) +- [CHANGELOG-1.15.md](./CHANGELOG-1.15.md) +- [CHANGELOG-1.14.md](./CHANGELOG-1.14.md) +- [CHANGELOG-1.13.md](./CHANGELOG-1.13.md) +- [CHANGELOG-1.12.md](./CHANGELOG-1.12.md) +- [CHANGELOG-1.11.md](./CHANGELOG-1.11.md) +- [CHANGELOG-1.10.md](./CHANGELOG-1.10.md) +- [CHANGELOG-1.9.md](./CHANGELOG-1.9.md) +- [CHANGELOG-1.8.md](./CHANGELOG-1.8.md) +- [CHANGELOG-1.7.md](./CHANGELOG-1.7.md) +- [CHANGELOG-1.6.md](./CHANGELOG-1.6.md) +- [CHANGELOG-1.5.md](./CHANGELOG-1.5.md) +- [CHANGELOG-1.4.md](./CHANGELOG-1.4.md) +- [CHANGELOG-1.3.md](./CHANGELOG-1.3.md) +- [CHANGELOG-1.2.md](./CHANGELOG-1.2.md) + +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/CHANGELOG.md?pixel)]() From e54bfa4652d2f87c7c625bd2758a96a1fb8c4c7c Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Thu, 6 Feb 2020 03:54:10 -0500 Subject: [PATCH 3/3] CHANGELOG: Collapse README.md headings in single list While it's not happening today, we'll want to eventually also handle updates to this CHANGELOG list via krel changelog. By collapsing the set of changelogs into a single list, it will be a little easier to write out an updated file for commit by searching the contents of the directory that match "CHANGELOG-x.y.md" and adding them to the list. Signed-off-by: Stephen Augustus --- CHANGELOG/README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md index f6450c24cc9..ad8367f04bd 100644 --- a/CHANGELOG/README.md +++ b/CHANGELOG/README.md @@ -1,15 +1,7 @@ # CHANGELOGs -## Development release - - [CHANGELOG-1.18.md](./CHANGELOG-1.18.md) - -## Current release - - [CHANGELOG-1.17.md](./CHANGELOG-1.17.md) - -## Older releases - - [CHANGELOG-1.16.md](./CHANGELOG-1.16.md) - [CHANGELOG-1.15.md](./CHANGELOG-1.15.md) - [CHANGELOG-1.14.md](./CHANGELOG-1.14.md)