Skip to content

Fix generating duplicates and omitting heading #2020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2021
Merged

Fix generating duplicates and omitting heading #2020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/changelog/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ filename | sha512 hash
{{end}}

{{- with .Downloads.Client -}}
### Client binaries
### Client Binaries

filename | sha512 hash
-------- | -----------
{{range .}}[{{.Name}}]({{.URL}}) | {{.Checksum}}{{println}}{{end}}
{{end}}

{{- with .Downloads.Server -}}
### Server binaries
### Server Binaries

filename | sha512 hash
-------- | -----------
{{range .}}[{{.Name}}]({{.URL}}) | {{.Checksum}}{{println}}{{end}}
{{end}}

{{- with .Downloads.Node -}}
### Node binaries
### Node Binaries

filename | sha512 hash
-------- | -----------
Expand Down
2 changes: 1 addition & 1 deletion pkg/notes/document/document.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func CreateDownloadsTable(w io.Writer, bucket, tars, prevTag, newTag string) err

// Sort the files by their headers
headers := [4]string{
"", "Client Binaries", "Server Binaries", "Node Binaries",
"Source Code", "Client Binaries", "Server Binaries", "Node Binaries",
}
files := map[string][]File{
headers[0]: fileMetadata.Source,
Expand Down
2 changes: 2 additions & 0 deletions pkg/notes/document/document_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ func TestCreateDownloadsTable(t *testing.T) {

## Downloads for v1.16.1

### Source Code

filename | sha512 hash
-------- | -----------
[kubernetes.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes.tar.gz) | `+"`"+`27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29`+"`"+`
Expand Down
9 changes: 3 additions & 6 deletions pkg/notes/document/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ package document
const defaultReleaseNotesTemplate = `
{{- $CurrentRevision := .CurrentRevision -}}
{{- $PreviousRevision := .PreviousRevision -}}
# Release notes for {{$CurrentRevision}}

[Documentation](https://docs.k8s.io/docs/home)
{{if .Downloads}}
## Downloads for {{$CurrentRevision}}

Expand All @@ -38,30 +36,29 @@ filename | sha512 hash
{{end}}

{{- with .Downloads.Client -}}
### Client binaries
### Client Binaries

filename | sha512 hash
-------- | -----------
{{range .}}[{{.Name}}]({{.URL}}) | {{.Checksum}}{{println}}{{end}}
{{end}}

{{- with .Downloads.Server -}}
### Server binaries
### Server Binaries

filename | sha512 hash
-------- | -----------
{{range .}}[{{.Name}}]({{.URL}}) | {{.Checksum}}{{println}}{{end}}
{{end}}

{{- with .Downloads.Node -}}
### Node binaries
### Node Binaries

filename | sha512 hash
-------- | -----------
{{range .}}[{{.Name}}]({{.URL}}) | {{.Checksum}}{{println}}{{end}}
{{end -}}
{{- end -}}
# Changelog since {{$PreviousRevision}}

{{with .CVEList -}}
## Important Security Information
Expand Down
12 changes: 3 additions & 9 deletions pkg/notes/document/testdata/document.md.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Release notes for v1.16.1

[Documentation](https://docs.k8s.io/docs/home)

## Downloads for v1.16.1

### Source Code
Expand All @@ -11,7 +7,7 @@ filename | sha512 hash
[kubernetes.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29
[kubernetes-src.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes-src.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29

### Client binaries
### Client Binaries

filename | sha512 hash
-------- | -----------
Expand All @@ -26,7 +22,7 @@ filename | sha512 hash
[kubernetes-client-windows-386.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes-client-windows-386.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29
[kubernetes-client-windows-amd64.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes-client-windows-amd64.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29

### Server binaries
### Server Binaries

filename | sha512 hash
-------- | -----------
Expand All @@ -36,7 +32,7 @@ filename | sha512 hash
[kubernetes-server-linux-ppc64le.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes-server-linux-ppc64le.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29
[kubernetes-server-linux-s390x.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes-server-linux-s390x.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29

### Node binaries
### Node Binaries

filename | sha512 hash
-------- | -----------
Expand All @@ -47,8 +43,6 @@ filename | sha512 hash
[kubernetes-node-linux-s390x.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes-node-linux-s390x.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29
[kubernetes-node-windows-amd64.tar.gz](https://dl.k8s.io/v1.16.1/kubernetes-node-windows-amd64.tar.gz) | 27864cc5219a951a7a6e52b8c8dddf6981d098da1658d96258c870b2c88dfbcb51841aea172a28bafa6a79731165584677066045c959ed0f9929688d04defc29

# Changelog since v1.16.0

## Urgent Upgrade Notes

### (No, really, you MUST read this before you upgrade)
Expand Down
5 changes: 0 additions & 5 deletions pkg/notes/document/testdata/document_without_downloads.md.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# Release notes for v1.16.1

[Documentation](https://docs.k8s.io/docs/home)
# Changelog since v1.16.0

## Urgent Upgrade Notes

### (No, really, you MUST read this before you upgrade)
Expand Down