Skip to content

Commit d2b9186

Browse files
committed
Fix notes.go so that it still complies with forbidigo
Signed-off-by: peppi-lotta <[email protected]>
1 parent c8a6082 commit d2b9186

File tree

2 files changed

+127
-14
lines changed

2 files changed

+127
-14
lines changed

hack/tools/release/notes.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package main
2222
import (
2323
"context"
2424
"flag"
25-
"fmt"
25+
fmt2 "fmt"
2626
"log"
2727
"os"
2828
"os/exec"
@@ -213,7 +213,7 @@ func run() int {
213213
}
214214
body = "- " + body
215215

216-
_, err := fmt.Sscanf(c.merge, "Merge pull request %s from %s", &prNumber, &fork)
216+
_, err := fmt2.Sscanf(c.merge, "Merge pull request %s from %s", &prNumber, &fork)
217217
if err != nil {
218218
log.Fatalf("Error parsing merge commit message: %v", err)
219219
}
@@ -226,32 +226,32 @@ func run() int {
226226
merges[superseded] = append(merges[superseded], "- `<insert superseded bumps and reverts here>`")
227227
}
228228

229-
log.Println("<!-- markdownlint-disable no-inline-html line-length -->")
229+
fmt2.Println("<!-- markdownlint-disable no-inline-html line-length -->")
230230
// TODO Turn this into a link (requires knowing the project name + organization)
231-
log.Printf("# Changes since %v\n\n", lastTag)
231+
fmt2.Printf("# Changes since %v\n\n", lastTag)
232232

233233
// print the changes by category
234234
for _, key := range outputOrder {
235235
mergeslice := merges[key]
236236
if len(mergeslice) > 0 {
237-
log.Printf("## %v\n\n", key)
237+
fmt2.Printf("## %v\n\n", key)
238238
for _, merge := range mergeslice {
239-
log.Println(merge)
239+
fmt2.Println(merge)
240240
}
241-
log.Println()
241+
fmt2.Println()
242242
}
243243

244244
// if we're doing beta/rc, print breaking changes and hide the rest of the changes
245245
if key == warning {
246246
if isBeta(latestTag) {
247-
log.Printf(warningTemplate, "BETA RELEASE")
247+
fmt2.Printf(warningTemplate, "BETA RELEASE")
248248
}
249249
if isRC(latestTag) {
250-
log.Printf(warningTemplate, "RELEASE CANDIDATE")
250+
fmt2.Printf(warningTemplate, "RELEASE CANDIDATE")
251251
}
252252
if isBeta(latestTag) || isRC(latestTag) {
253-
log.Printf("<details>\n")
254-
log.Printf("<summary>More details about the release</summary>\n\n")
253+
fmt2.Printf("<details>\n")
254+
fmt2.Printf("<summary>More details about the release</summary>\n\n")
255255
}
256256
}
257257
}
@@ -261,8 +261,8 @@ func run() int {
261261
log.Printf("</details>\n\n")
262262
}
263263

264-
log.Printf("The container image for this release is: %v\n", latestTag)
265-
log.Println("\n_Thanks to all our contributors!_ 😊")
264+
fmt2.Printf("The container image for this release is: %v\n", latestTag)
265+
fmt2.Println("\n_Thanks to all our contributors!_ 😊")
266266

267267
return 0
268268
}
@@ -276,7 +276,7 @@ func formatMerge(line, prNumber string) string {
276276
if prNumber == "" {
277277
return line
278278
}
279-
return fmt.Sprintf("%s (%s)", line, prNumber)
279+
return fmt2.Sprintf("%s (%s)", line, prNumber)
280280
}
281281

282282
// getCommitHashFromNewTag returns the latest commit hash for the specified tag.

releasenotes/v1.10.0.md

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<!-- markdownlint-disable no-inline-html line-length -->
2+
# Changes since v1.9.0
3+
4+
## :warning: Breaking Changes
5+
6+
- Decouple webhooks from api (#944)
7+
- Make ip-address-manager an IPAM provider for CAPI (#692)
8+
9+
## :sparkles: New Features
10+
11+
- Adding feature for allocating requested IP (#997)
12+
13+
## :bug: Bug Fixes
14+
15+
- bump golang to 1.23.6 (#887)
16+
- bump golang to 1.23.5 (#869)
17+
18+
## :book: Documentation
19+
20+
- Limitation regarding IPClaim (#996)
21+
- Make Adil and Peppi maintainers (#1000)
22+
- update OpenSSF CII Best Practices badge (#868)
23+
- add adilGhaffarDev as reviewer (#809)
24+
25+
## :seedling: Others
26+
27+
- Bump CAPI to v1.10.0-rc.1 (#1004)
28+
- Set GITHUB_TOKEN in env in release workflow (#1003)
29+
- Enable dupl linter (#999)
30+
- Bump github.com/onsi/gomega from 1.36.3 to 1.37.0 (#989)
31+
- Bump github.com/onsi/ginkgo/v2 from 2.23.3 to 2.23.4 (#994)
32+
- add labels to Dockerfile (#986)
33+
- make osv-scanner scan run daily (#987)
34+
- Bump golang.org/x/oauth2 from 0.28.0 to 0.29.0 in /hack/tools (#992)
35+
- Bump the github-actions group with 4 updates (#981)
36+
- bump golang to v1.23.8 and x/net to v0.38.0 (#982)
37+
- do not bump major version of github actions (#976)
38+
- move mquhuy to emeritus reviewers (#975)
39+
- Enable errname, forbidigo, forcetypeassert, mnd, perfsprint and unparam linters (#972)
40+
- Enable ginkgolinter (#970)
41+
- update the used linters list (#958)
42+
- Bump kustomize to 5.6.0 and code-generator to 0.32.3 (#956)
43+
- Bump the kubernetes apiserver and client-go to v0.32.3 (#946)
44+
- update osv-scanner to v2.0.0 (#943)
45+
- Bump sigs.k8s.io/controller-runtime from 0.20.3 to 0.20.4 (#952)
46+
- Bump github.com/onsi/gomega from 1.36.2 to 1.36.3 (#949)
47+
- Bump golangci-lint to v1.64.7 (#942)
48+
- Bump golang.org/x/oauth2 from 0.27.0 to 0.28.0 in /hack/tools (#932)
49+
- Bump the kubernetes group to v0.31.7 (#931)
50+
- bump tj-actions/changed-files to v46.0.1 (#939)
51+
- group all github action bumps into single PR (#934)
52+
- bump x/oauth2 to v0.27.0 (#927)
53+
- Bump golang.org/x/net from 0.35.0 to 0.36.0 in /api (#926)
54+
- Bump golang.org/x/net from 0.35.0 to 0.36.0 (#925)
55+
- fix dependabot testing issues by re-adding "edited" (#923)
56+
- Bump golang.org/x/net from 0.34.0 to 0.36.0 in /hack/tools (#924)
57+
- Bump github.com/onsi/ginkgo/v2 from 2.22.2 (#918)
58+
- Bump sigs.k8s.io/controller-runtime from 0.19.6 to 0.19.7 (#920)
59+
- bump golang to 1.23.7 (#913)
60+
- Bump tj-actions/changed-files from 45.0.6 to 45.0.7 (#910)
61+
- Bump github/codeql-action from 3.28.8 to 3.28.10 (#908)
62+
- Bump actions/cache from 4.2.0 to 4.2.2 (#907)
63+
- Bump golang.org/x/oauth2 from 0.26.0 to 0.27.0 in /hack/tools (#905)
64+
- Bump the kubernetes group across 3 directories with 6 updates (#897)
65+
- Bump sigs.k8s.io/controller-runtime from 0.19.5 to 0.19.6 (#899)
66+
- pin osv-scanner image in verify-release.sh (#888)
67+
- workflows: sync pull_request trigger types (#885)
68+
- Bump golang.org/x/oauth2 from 0.25.0 to 0.26.0 in /hack/tools (#886)
69+
- Bump github.com/spf13/pflag from 1.0.5 to 1.0.6 (#880)
70+
- Bump tj-actions/changed-files from 45.0.5 to 45.0.6 (#878)
71+
- Bump softprops/action-gh-release from 2.2.0 to 2.2.1 (#875)
72+
- Bump actions/setup-go from 5.2.0 to 5.3.0 (#876)
73+
- Bump golangci/golangci-lint-action from 6.1.1 to 6.2.0 (#877)
74+
- Bump github/codeql-action from 3.28.0 to 3.28.8 (#874)
75+
- Bump sigs.k8s.io/controller-runtime from 0.19.4 to 0.19.5 (#863)
76+
- Introduce ReconcileError with Transient and Terminal Error type (#787)
77+
- Bump the k8s.io/* deps to v0.31.5 (#857)
78+
- Bump sigs.k8s.io/controller-runtime from 0.19.3 to 0.19.4 (#852)
79+
- bump x/net to v0.34.0 (#848)
80+
- bump kubeconform to v0.6.7 (#847)
81+
- Add read permission to build job in release wf (#845)
82+
- Bump golang.org/x/oauth2 from 0.24.0 to 0.25.0 in /hack/tools (#841)
83+
- Add build container image as a job in release wf (#840)
84+
- Bump github.com/onsi/ginkgo/v2 from 2.22.0 to 2.22.2 (#829)
85+
- Bump github.com/onsi/gomega from 1.36.1 to 1.36.2 (#830)
86+
- Bump github/codeql-action from 3.27.9 to 3.28.0 (#836)
87+
- Bump google/osv-scanner from 1.9.1 to 1.9.2 (#837)
88+
- Bump sigs.k8s.io/cluster-api from 1.9.2 to 1.9.3 in the capi group across 1 directory (#823)
89+
- Bump sigs.k8s.io/kustomize/kustomize/v5 to 5.5.0 (#817)
90+
- Bump softprops/action-gh-release from 2.1.0 to 2.2.0 (#801)
91+
- Bump tj-actions/changed-files from 45.0.4 to 45.0.5 (#798)
92+
- Bump actions/setup-go from 5.1.0 to 5.2.0 (#796)
93+
- Bump github.com/onsi/gomega from 1.36.0 to 1.36.1 (#793)
94+
- Bump github/codeql-action from 3.27.5 to 3.27.9 (#802)
95+
- Bump actions/cache from 4.1.2 to 4.2.0 (#800)
96+
- replace release-1.7 with 1.9 in dependabot config (#795)
97+
- Bump the k8s.io/* deps to v0.31.4 (#791)
98+
- Fix container image build workflow (#789)
99+
- Fix release-notes in Makefile (#786)
100+
101+
## :recycle: Superseded or Reverted
102+
103+
- Bump CAPI to v1.10.0-rc.0 (#998)
104+
- Bump CAPI to 1.10.0-beta.1 (#957)
105+
- bump CAPI v1.10.0-beta.0 (#941)
106+
- Bump CAPI to 1.9.5 (#902)
107+
- Bump CAPI to v1.9.4 (#861)
108+
- Bump CAPI to v1.9.2 (#821)
109+
- Bump CAPI to v1.9.1 (#806)
110+
111+
The container image for this release is: v1.10.0
112+
113+
_Thanks to all our contributors!_ 😊

0 commit comments

Comments
 (0)