Skip to content

Commit 6bb5ee3

Browse files
authored
Change Helm related images format (CrunchyData#45)
Provide flexibility by allowing user to just specify the image itself. This avoids messy image repo / name / tag stuff, and aligns more with convention. closes CrunchyData#36
1 parent ac2188a commit 6bb5ee3

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

helm/install/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: pgo
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 0.1.0
5+
version: 0.2.0
66
appVersion: 5.0.3

helm/install/templates/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
value: "true"
2424
{{- range $image_name, $image_val := .Values.relatedImages }}
2525
- name: RELATED_IMAGE_{{ $image_name | upper }}
26-
value: "{{ $image_val.repository }}:{{ $image_val.tag }}"
26+
value: "{{ $image_val.image }}"
2727
{{- end }}
2828
{{- if .Values.singleNamespace }}
2929
- name: PGO_TARGET_NAMESPACE

helm/install/values.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@ image:
55
tag: ubi8-5.0.3-0
66

77
relatedImages:
8+
postgres_14:
9+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:centos8-14.0-0
10+
postgres_14_gis_3.1:
11+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:centos8-14.0-3.1-0
812
postgres_13:
9-
repository: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-ha
10-
tag: centos8-13.4-0
13+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:centos8-13.4-1
1114
postgres_13_gis_3.1:
12-
repository: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis-ha
13-
tag: centos8-13.4-3.1-0
15+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:centos8-13.4-3.1-1
1416
pgbackrest:
15-
repository: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest
16-
tag: centos8-2.33-2
17+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:centos8-2.35-0
1718
pgbouncer:
18-
repository: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer
19-
tag: centos8-1.15-2
19+
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:centos8-1.15-3
2020
pgexporter:
21-
repository: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter
22-
tag: ubi8-5.0.2-0
21+
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.0.3-0
2322

2423
## Install in default or single namespace mode
2524
singleNamespace: false

0 commit comments

Comments
 (0)