From 19a0e7845116c8d56a38443c0785447991a06a9e Mon Sep 17 00:00:00 2001 From: Shanshan Date: Fri, 15 Nov 2024 14:12:25 +0800 Subject: [PATCH 1/2] chore: update neon image using tpl --- addons/neon/templates/_helpers.tpl | 10 ++++++++++ addons/neon/templates/cmpv-compute.yaml | 4 ++-- addons/neon/templates/cmpv-pageserver.yaml | 4 ++-- addons/neon/templates/cmpv-safekeeper.yaml | 4 ++-- addons/neon/templates/cmpv-storagebroker.yaml | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/addons/neon/templates/_helpers.tpl b/addons/neon/templates/_helpers.tpl index c1f7e1d9b..f24ac810a 100755 --- a/addons/neon/templates/_helpers.tpl +++ b/addons/neon/templates/_helpers.tpl @@ -78,3 +78,13 @@ Generate config configmap {{- end }} + + + +{{/* +Define image +*/}} + +{{- define "neon.image" -}} +{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} +{{- end }} \ No newline at end of file diff --git a/addons/neon/templates/cmpv-compute.yaml b/addons/neon/templates/cmpv-compute.yaml index fe9132aa5..c0306a04b 100644 --- a/addons/neon/templates/cmpv-compute.yaml +++ b/addons/neon/templates/cmpv-compute.yaml @@ -11,8 +11,8 @@ spec: releases: - pg14-1.0.0 releases: - - name: pg14-1.0.0 + - name: pg14-1.0.0 changes: serviceVersion: 1.0.0 images: - neon-compute: perconalab/neon:pg14-1.0.0 \ No newline at end of file + neon-compute: {{ include "neon.image" . }} \ No newline at end of file diff --git a/addons/neon/templates/cmpv-pageserver.yaml b/addons/neon/templates/cmpv-pageserver.yaml index f3d1b073a..7f730b975 100644 --- a/addons/neon/templates/cmpv-pageserver.yaml +++ b/addons/neon/templates/cmpv-pageserver.yaml @@ -11,8 +11,8 @@ spec: releases: - pg14-1.0.0 releases: - - name: pg14-1.0.0 + - name: pg14-1.0.0 changes: serviceVersion: 1.0.0 images: - neon-pageserver: perconalab/neon:pg14-1.0.0 + neon-pageserver: {{ include "neon.image" . }} diff --git a/addons/neon/templates/cmpv-safekeeper.yaml b/addons/neon/templates/cmpv-safekeeper.yaml index 1c0f004c5..12a2399b1 100644 --- a/addons/neon/templates/cmpv-safekeeper.yaml +++ b/addons/neon/templates/cmpv-safekeeper.yaml @@ -11,8 +11,8 @@ spec: releases: - pg14-1.0.0 releases: - - name: pg14-1.0.0 + - name: pg14-1.0.0 changes: serviceVersion: 1.0.0 images: - neon-safekeeper: perconalab/neon:pg14-1.0.0 + neon-safekeeper: {{ include "neon.image" . }} diff --git a/addons/neon/templates/cmpv-storagebroker.yaml b/addons/neon/templates/cmpv-storagebroker.yaml index 7e2d48cdf..a348d7381 100644 --- a/addons/neon/templates/cmpv-storagebroker.yaml +++ b/addons/neon/templates/cmpv-storagebroker.yaml @@ -15,4 +15,4 @@ spec: changes: serviceVersion: 1.0.0 images: - neon-storagebroker: perconalab/neon:pg14-1.0.0 + neon-storagebroker: {{ include "neon.image" . }} \ No newline at end of file From 068a74bd63d60f58a76b13502209c5e7556beec7 Mon Sep 17 00:00:00 2001 From: Shanshan Date: Fri, 15 Nov 2024 14:23:21 +0800 Subject: [PATCH 2/2] remove image tag from tpl --- addons/neon/templates/_helpers.tpl | 2 +- addons/neon/templates/cmpv-compute.yaml | 2 +- addons/neon/templates/cmpv-pageserver.yaml | 2 +- addons/neon/templates/cmpv-safekeeper.yaml | 2 +- addons/neon/templates/cmpv-storagebroker.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/neon/templates/_helpers.tpl b/addons/neon/templates/_helpers.tpl index f24ac810a..45e6d16e7 100755 --- a/addons/neon/templates/_helpers.tpl +++ b/addons/neon/templates/_helpers.tpl @@ -86,5 +86,5 @@ Define image */}} {{- define "neon.image" -}} -{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} +{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }} {{- end }} \ No newline at end of file diff --git a/addons/neon/templates/cmpv-compute.yaml b/addons/neon/templates/cmpv-compute.yaml index c0306a04b..752cd42d8 100644 --- a/addons/neon/templates/cmpv-compute.yaml +++ b/addons/neon/templates/cmpv-compute.yaml @@ -15,4 +15,4 @@ spec: changes: serviceVersion: 1.0.0 images: - neon-compute: {{ include "neon.image" . }} \ No newline at end of file + neon-compute: {{ include "neon.image" . }}:pg14-1.0.0 \ No newline at end of file diff --git a/addons/neon/templates/cmpv-pageserver.yaml b/addons/neon/templates/cmpv-pageserver.yaml index 7f730b975..5b6b7d38c 100644 --- a/addons/neon/templates/cmpv-pageserver.yaml +++ b/addons/neon/templates/cmpv-pageserver.yaml @@ -15,4 +15,4 @@ spec: changes: serviceVersion: 1.0.0 images: - neon-pageserver: {{ include "neon.image" . }} + neon-pageserver: {{ include "neon.image" . }}:pg14-1.0.0 diff --git a/addons/neon/templates/cmpv-safekeeper.yaml b/addons/neon/templates/cmpv-safekeeper.yaml index 12a2399b1..114ac86ca 100644 --- a/addons/neon/templates/cmpv-safekeeper.yaml +++ b/addons/neon/templates/cmpv-safekeeper.yaml @@ -15,4 +15,4 @@ spec: changes: serviceVersion: 1.0.0 images: - neon-safekeeper: {{ include "neon.image" . }} + neon-safekeeper: {{ include "neon.image" . }}:pg14-1.0.0 diff --git a/addons/neon/templates/cmpv-storagebroker.yaml b/addons/neon/templates/cmpv-storagebroker.yaml index a348d7381..9247a9d0e 100644 --- a/addons/neon/templates/cmpv-storagebroker.yaml +++ b/addons/neon/templates/cmpv-storagebroker.yaml @@ -15,4 +15,4 @@ spec: changes: serviceVersion: 1.0.0 images: - neon-storagebroker: {{ include "neon.image" . }} \ No newline at end of file + neon-storagebroker: {{ include "neon.image" . }}:pg14-1.0.0 \ No newline at end of file