DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix controller tag in release

Browse source 
Signed-off-by: James Strong <james.strong@chainguard.dev>
This commit is contained in:
James Strong 2023-05-05 09:52:39 -04:00
parent 3d73327994
commit c3a22a219a
Failed to extract signature
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog/Changelog-1.7.1.md
View file

@ -3,8 +3,8 @@
### 1.7.1 ### 1.7.1
Images: Images:
* registry.k8s.io/controller:controller-v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407 * registry.k8s.io/ingress-nginx/controller:v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
* registry.k8s.io/controller-chroot:controller-v1.7.1@sha256:e35d5ab487861b9d419c570e3530589229224a0762c7b4d2e2222434abb8d988 * registry.k8s.io/ingress-nginx/controller-chroot:v1.7.1@sha256:e35d5ab487861b9d419c570e3530589229224a0762c7b4d2e2222434abb8d988
### All Changes: ### All Changes:

2
magefiles/helm.go
View file

@ -104,7 +104,7 @@ func updateChartReleaseNotes(releasesNotes []string) {
CheckIfError(err, "HELM Could not Load Chart to update release notes %s", HelmChartPath) CheckIfError(err, "HELM Could not Load Chart to update release notes %s", HelmChartPath)
var releaseNoteString string var releaseNoteString string
for i := range releasesNotes { for i := range releasesNotes {
releaseNoteString = fmt.Sprintf("%s - %s\n", releaseNoteString, releasesNotes[i]) releaseNoteString = fmt.Sprintf("%s - \"%s\"\n", releaseNoteString, releasesNotes[i])
} }
Info("HELM Release note string %s", releaseNoteString) Info("HELM Release note string %s", releaseNoteString)
chart.Annotations["artifacthub.io/changes"] = releaseNoteString chart.Annotations["artifacthub.io/changes"] = releaseNoteString

12
magefiles/release.go
View file

@ -356,15 +356,17 @@ func makeReleaseNotes(newVersion string) (*ReleaseNote, error) {
c1 := ControllerImage{ c1 := ControllerImage{
Digest: controllerDigest, Digest: controllerDigest,
Registry: INGRESS_REGISTRY, Registry: INGRESS_REGISTRY,
Name: "controller", Name: "ingress-nginx/controller",
Tag: newReleaseNotes.NewControllerVersion, Tag: fmt.Sprintf("v%s", newReleaseNotes.Version),
} }
c2 := ControllerImage{ c2 := ControllerImage{
Digest: controllerChrootDigest, Digest: controllerChrootDigest,
Registry: INGRESS_REGISTRY, Registry: INGRESS_REGISTRY,
Name: "controller-chroot", Name: "ingress-nginx/controller-chroot",
Tag: newReleaseNotes.NewControllerVersion, Tag: fmt.Sprintf("v%s", newReleaseNotes.Version),
} }
newReleaseNotes.ControllerImages = append(newReleaseNotes.ControllerImages, c1) newReleaseNotes.ControllerImages = append(newReleaseNotes.ControllerImages, c1)
newReleaseNotes.ControllerImages = append(newReleaseNotes.ControllerImages, c2) newReleaseNotes.ControllerImages = append(newReleaseNotes.ControllerImages, c2)
Debug("New Release Controller Images %s %s", newReleaseNotes.ControllerImages[0].Digest, newReleaseNotes.ControllerImages[1].Digest) Debug("New Release Controller Images %s %s", newReleaseNotes.ControllerImages[0].Digest, newReleaseNotes.ControllerImages[1].Digest)
@ -413,7 +415,7 @@ func (r ReleaseNote) helmTemplate() {
Debug("ChangeLog Templates %s", string(changelogTemplate)) Debug("ChangeLog Templates %s", string(changelogTemplate))
t := template.Must(template.New("changelog").Parse(string(changelogTemplate))) t := template.Must(template.New("changelog").Parse(string(changelogTemplate)))
// create a new file // create a new file
file, err := os.Create(fmt.Sprintf("charts/ingress-nginx/changelog/Changelog-%s.md", r.Version)) file, err := os.Create(fmt.Sprintf("charts/ingress-nginx/changelog/Changelog-%s.md", r.NewHelmChartVersion))
if err != nil { if err != nil {
ErrorF("Could not create changelog file %s", err) ErrorF("Could not create changelog file %s", err)
} }