From 3ef7f90e8033d861c08e5c678c24e8b233851b20 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 22:10:33 +0000 Subject: [PATCH 01/12] Update README.md.gotmpl --- docs/README.md.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index b097e3f..ed712d2 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -11,7 +11,7 @@ {{- if .Home }} - <{{ template "chart.homepage" . }}> {{- end }} -{{ template "chart.sourcesList" . }} +{{ include "chart.sourcesList" . | replace "*" "-" }} {{ end }} {{ template "extra.upstreamReleaseNotesMarkdown" . }} -- GitLab From b6d461224c7f747832179d198f17ccdc954e0645 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:27:49 -0500 Subject: [PATCH 02/12] revert readme template change --- docs/README.md.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index ed712d2..b097e3f 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -11,7 +11,7 @@ {{- if .Home }} - <{{ template "chart.homepage" . }}> {{- end }} -{{ include "chart.sourcesList" . | replace "*" "-" }} +{{ template "chart.sourcesList" . }} {{ end }} {{ template "extra.upstreamReleaseNotesMarkdown" . }} -- GitLab From 54930ea0e130913bed54aafbe823c7322e125a00 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:33:15 -0500 Subject: [PATCH 03/12] test replacing chart.sourcesList template --- docs/_templates.gotmpl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/_templates.gotmpl b/docs/_templates.gotmpl index 9f58ae8..00470a5 100644 --- a/docs/_templates.gotmpl +++ b/docs/_templates.gotmpl @@ -5,6 +5,13 @@ {{ end }} {{ end }} +{{ define "chart.sourcesList" }} +{{ $chartYaml := (.Files.Get "Chart.yaml") | fromYaml }} +{{ range $chartYaml.sources }} +- <{{ . }}> +{{ end }} +{{ end }} + {{ define "extra.upstreamReleaseNotesMarkdown" }} {{ $chartYaml := (.Files.Get "Chart.yaml") | fromYaml }} {{ $defaultNotes := "This package has no upstream release note links on file. Please add some to [chart/Chart.yaml](chart/Chart.yaml) under `annotations.bigbang.dev/upstreamReleaseNotesMarkdown`.\nExample:\n```yaml\nannotations:\n bigbang.dev/upstreamReleaseNotesMarkdown: |\n - [Find our upstream chart's CHANGELOG here](https://link-goes-here/CHANGELOG.md)\n - [and our upstream application release notes here](https://another-link-here/RELEASE_NOTES.md)\n```" }} -- GitLab From cb5e088c5e30bac8e2c3636d8a3c7f997ed6a00f Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:38:03 -0500 Subject: [PATCH 04/12] test removing extra line breaks --- docs/README.md.gotmpl | 4 ++-- docs/_templates.gotmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index b097e3f..8088fb0 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -9,9 +9,9 @@ {{ if or .Home .Sources }} ## Upstream References {{- if .Home }} -- <{{ template "chart.homepage" . }}> +- <{{ template "chart.homepage" . -}}> {{- end }} -{{ template "chart.sourcesList" . }} +{{ template "chart.sourcesList" . -}} {{ end }} {{ template "extra.upstreamReleaseNotesMarkdown" . }} diff --git a/docs/_templates.gotmpl b/docs/_templates.gotmpl index 00470a5..ef21302 100644 --- a/docs/_templates.gotmpl +++ b/docs/_templates.gotmpl @@ -7,9 +7,9 @@ {{ define "chart.sourcesList" }} {{ $chartYaml := (.Files.Get "Chart.yaml") | fromYaml }} -{{ range $chartYaml.sources }} +{{- range $chartYaml.sources }} - <{{ . }}> -{{ end }} +{{- end }} {{ end }} {{ define "extra.upstreamReleaseNotesMarkdown" }} -- GitLab From d9a83242c50058618fef6ffcc5a736612b73ee65 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:39:57 -0500 Subject: [PATCH 05/12] more line breaks --- docs/README.md.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index 8088fb0..1c5e946 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -11,7 +11,7 @@ {{- if .Home }} - <{{ template "chart.homepage" . -}}> {{- end }} -{{ template "chart.sourcesList" . -}} +{{- template "chart.sourcesList" . -}} {{ end }} {{ template "extra.upstreamReleaseNotesMarkdown" . }} -- GitLab From fe700a7cb32e73ffc69c3171e28a153193f044ec Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:41:11 -0500 Subject: [PATCH 06/12] now that's what I call line breaks --- docs/README.md.gotmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index 1c5e946..8bac302 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -8,9 +8,9 @@ {{ if or .Home .Sources }} ## Upstream References -{{- if .Home }} -- <{{ template "chart.homepage" . -}}> -{{- end }} +{{- if .Home -}} +- <{{- template "chart.homepage" . -}}> +{{- end -}} {{- template "chart.sourcesList" . -}} {{ end }} -- GitLab From 93eae6db25c065a076d8abf82bd4979984c0e51d Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:51:05 -0500 Subject: [PATCH 07/12] more line break tweaks --- docs/README.md.gotmpl | 2 +- docs/_templates.gotmpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index 8bac302..53b6d4e 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -9,7 +9,7 @@ {{ if or .Home .Sources }} ## Upstream References {{- if .Home -}} -- <{{- template "chart.homepage" . -}}> +- <{{ template "chart.homepage" . -}}> {{- end -}} {{- template "chart.sourcesList" . -}} {{ end }} diff --git a/docs/_templates.gotmpl b/docs/_templates.gotmpl index ef21302..87020fa 100644 --- a/docs/_templates.gotmpl +++ b/docs/_templates.gotmpl @@ -5,12 +5,12 @@ {{ end }} {{ end }} -{{ define "chart.sourcesList" }} -{{ $chartYaml := (.Files.Get "Chart.yaml") | fromYaml }} +{{- define "chart.sourcesList" }} +{{- $chartYaml := (.Files.Get "Chart.yaml") | fromYaml }} {{- range $chartYaml.sources }} - <{{ . }}> {{- end }} -{{ end }} +{{- end }} {{ define "extra.upstreamReleaseNotesMarkdown" }} {{ $chartYaml := (.Files.Get "Chart.yaml") | fromYaml }} -- GitLab From 556cb33cd29040a9bc3f1e24028120741cc02d53 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:52:47 -0500 Subject: [PATCH 08/12] more line break tweaks --- docs/README.md.gotmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index 53b6d4e..9309304 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -8,9 +8,9 @@ {{ if or .Home .Sources }} ## Upstream References -{{- if .Home -}} -- <{{ template "chart.homepage" . -}}> -{{- end -}} +{{- if .Home }} +- <{{ template "chart.homepage" . }}> +{{- end }} {{- template "chart.sourcesList" . -}} {{ end }} -- GitLab From e540dde265059a350c16cf3ee7b71300d4d04fb3 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:53:54 -0500 Subject: [PATCH 09/12] more line break tweaks --- docs/README.md.gotmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index 9309304..ee066b6 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -8,9 +8,9 @@ {{ if or .Home .Sources }} ## Upstream References -{{- if .Home }} +{{ if .Home }} - <{{ template "chart.homepage" . }}> -{{- end }} +{{ end }} {{- template "chart.sourcesList" . -}} {{ end }} -- GitLab From 49e91aa44fe1277d19240a2e284953129042f6f4 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:55:25 -0500 Subject: [PATCH 10/12] more line break tweaks --- docs/README.md.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index ee066b6..fe04f08 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -9,7 +9,7 @@ {{ if or .Home .Sources }} ## Upstream References {{ if .Home }} -- <{{ template "chart.homepage" . }}> +- <{{ template "chart.homepage" . -}}> {{ end }} {{- template "chart.sourcesList" . -}} {{ end }} -- GitLab From 8e9d56cf8bddb1bae4c8d2d8194ad8c1676cac1c Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 17:57:20 -0500 Subject: [PATCH 11/12] more line break tweaks --- docs/README.md.gotmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index fe04f08..66cd1f3 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -8,9 +8,10 @@ {{ if or .Home .Sources }} ## Upstream References -{{ if .Home }} -- <{{ template "chart.homepage" . -}}> -{{ end }} +{{- if .Home -}} + +- <{{ template "chart.homepage" . }}> +{{- end -}} {{- template "chart.sourcesList" . -}} {{ end }} -- GitLab From fab171ac10372b6080bc8d697fdbcb680f665530 Mon Sep 17 00:00:00 2001 From: Peter Sigur <sigur_peter@bah.com> Date: Mon, 13 Jan 2025 18:05:07 -0500 Subject: [PATCH 12/12] more line break tweaks --- docs/README.md.gotmpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/README.md.gotmpl b/docs/README.md.gotmpl index 66cd1f3..ac8b5f8 100644 --- a/docs/README.md.gotmpl +++ b/docs/README.md.gotmpl @@ -8,10 +8,9 @@ {{ if or .Home .Sources }} ## Upstream References -{{- if .Home -}} - +{{ if .Home }} - <{{ template "chart.homepage" . }}> -{{- end -}} +{{- end }} {{- template "chart.sourcesList" . -}} {{ end }} -- GitLab