Skip to content

Commit e29f5eb

Browse files
authored
Merge pull request #10993 from sapcc/library-charts-tags-as-templates
common/postgresql-ng, common/redis: move files/tags.json into templates
2 parents 123e3c9 + d0139ce commit e29f5eb

File tree

6 files changed

+35
-23
lines changed

6 files changed

+35
-23
lines changed

common/postgresql-ng/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ description: Chart for PostgreSQL
4747
#
4848
# 2.2.0
4949
# - Removed support for PostgreSQL 15, because Alpine 3.23 does not carry packages for it anymore.
50-
version: 2.2.27 # this version number is SemVer as it gets used to auto bump
50+
version: 2.2.28 # this version number is SemVer as it gets used to auto bump

common/postgresql-ng/files/tags.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

common/postgresql-ng/templates/_functions.tpl

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{- $repo := index . 1 -}}
44
{{- $version := index . 2 -}}
55

6-
{{- $all_tags := $ctx.Files.Get "files/tags.json" | required "files/tags.json not found" | fromJson -}}
6+
{{- $all_tags := include "postgresql-ng.tags_json" $ctx | fromJson -}}
77
{{- $repo_tags := index $all_tags $repo | required (printf "unknown repo: %q" (printf "shared-app-images/%s" $repo)) -}}
88
{{- index $repo_tags $version | required (printf "no such version in repo: %q" (printf "shared-app-images/%s:%s" $repo $version)) -}}
99
{{- end -}}
@@ -22,3 +22,17 @@
2222
{{- end }}
2323
{{- printf "%s/shared-app-images/%s:%s" $registry $repo $tag -}}
2424
{{- end -}}
25+
26+
{{- define "postgresql-ng.tags_json" -}}
27+
{{/* Do not change these marker comments! They are required for the automation that updates this data. */}}
28+
{{/* -----BEGIN TAGS_JSON PAYLOAD----- */}}
29+
{
30+
"alpine-kubectl": {
31+
"latest": "latest-20260305150720"
32+
},
33+
"alpine-psql": {
34+
"latest": "latest-20260307031328"
35+
}
36+
}
37+
{{/* -----END TAGS_JSON PAYLOAD----- */}}
38+
{{- end -}}

common/redis/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ name: redis
4949
#
5050
# 2.4.0
5151
# - Switch to inhouse-built redis_exporter image from ccloud/shared-app-images/redis-exporter.
52-
version: 2.4.17 # this version number is SemVer as it gets used to auto bump
52+
version: 2.4.18 # this version number is SemVer as it gets used to auto bump

common/redis/files/tags.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

common/redis/templates/_functions.tpl

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{- $repo := index . 1 -}}
44
{{- $version := index . 2 -}}
55

6-
{{- $all_tags := $ctx.Files.Get "files/tags.json" | required "files/tags.json not found" | fromJson -}}
6+
{{- $all_tags := include "redis.tags_json" $ctx | fromJson -}}
77
{{- $repo_tags := index $all_tags $repo | required (printf "unknown repo: %q" (printf "shared-app-images/%s" $repo)) -}}
88
{{- index $repo_tags $version | required (printf "no such version in repo: %q" (printf "shared-app-images/%s:%s" $repo $version)) -}}
99
{{- end -}}
@@ -22,3 +22,20 @@
2222
{{- end }}
2323
{{- printf "%s/shared-app-images/%s:%s" $registry $repo $tag -}}
2424
{{- end -}}
25+
26+
{{- define "redis.tags_json" -}}
27+
{{/* Do not change these marker comments! They are required for the automation that updates this data. */}}
28+
{{/* -----BEGIN TAGS_JSON PAYLOAD----- */}}
29+
{
30+
"alpine-kubectl": {
31+
"latest": "latest-20260305150720"
32+
},
33+
"alpine-valkey": {
34+
"9.0": "9.0-20260305142458"
35+
},
36+
"redis-exporter": {
37+
"latest": "1.82.0-20260309103756"
38+
}
39+
}
40+
{{/* -----END TAGS_JSON PAYLOAD----- */}}
41+
{{- end -}}

0 commit comments

Comments
 (0)