diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml index bb6cbc6..34b97dc 100644 --- a/charts/jumpserver/templates/celery/deployment-celery.yaml +++ b/charts/jumpserver/templates/celery/deployment-celery.yaml @@ -11,7 +11,7 @@ {{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }} {{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }} {{- $imageName := $.Values.xpack.enabled | ternary "core-ee" "core-ce" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := $.Chart.AppVersion }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/chen/deployment-chen.yaml b/charts/jumpserver/templates/chen/deployment-chen.yaml index 361cfbd..0460f41 100644 --- a/charts/jumpserver/templates/chen/deployment-chen.yaml +++ b/charts/jumpserver/templates/chen/deployment-chen.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "chen" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml index ffc065b..aec2144 100644 --- a/charts/jumpserver/templates/core/deployment-core.yaml +++ b/charts/jumpserver/templates/core/deployment-core.yaml @@ -11,7 +11,7 @@ {{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }} {{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }} {{- $imageName := $.Values.xpack.enabled | ternary "core-ee" "core-ce" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/kael/deployment-kael.yaml b/charts/jumpserver/templates/kael/deployment-kael.yaml index 5db710e..ed80bea 100644 --- a/charts/jumpserver/templates/kael/deployment-kael.yaml +++ b/charts/jumpserver/templates/kael/deployment-kael.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "kael" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/koko/deployment-koko.yaml b/charts/jumpserver/templates/koko/deployment-koko.yaml index e882be4..7ba508b 100644 --- a/charts/jumpserver/templates/koko/deployment-koko.yaml +++ b/charts/jumpserver/templates/koko/deployment-koko.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "koko" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/lion/deployment-lion.yaml b/charts/jumpserver/templates/lion/deployment-lion.yaml index 574eece..d37212c 100644 --- a/charts/jumpserver/templates/lion/deployment-lion.yaml +++ b/charts/jumpserver/templates/lion/deployment-lion.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "lion" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml index 2b28c88..b26c7e3 100644 --- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml +++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml @@ -12,7 +12,7 @@ {{- $oraclePortStart := printf "%s" (include "jumpserver.magnus.oracle.port.start" $) | int }} {{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int }} {{- $imageName := "magnus" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/pre-install-initdb.yaml b/charts/jumpserver/templates/pre-install-initdb.yaml index 570f1fe..3a08748 100644 --- a/charts/jumpserver/templates/pre-install-initdb.yaml +++ b/charts/jumpserver/templates/pre-install-initdb.yaml @@ -4,7 +4,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := $.Values.xpack.enabled | ternary "core-ee" "core-ce" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: batch/v1 diff --git a/charts/jumpserver/templates/razor/deployment-razor.yaml b/charts/jumpserver/templates/razor/deployment-razor.yaml index 55ec9c7..e2a06aa 100644 --- a/charts/jumpserver/templates/razor/deployment-razor.yaml +++ b/charts/jumpserver/templates/razor/deployment-razor.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "razor" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/video/deployment-video.yaml b/charts/jumpserver/templates/video/deployment-video.yaml index 40cd9b6..89374d2 100644 --- a/charts/jumpserver/templates/video/deployment-video.yaml +++ b/charts/jumpserver/templates/video/deployment-video.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "video-worker" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/web/deployment-nginx.yaml b/charts/jumpserver/templates/web/deployment-web.yaml similarity index 98% rename from charts/jumpserver/templates/web/deployment-nginx.yaml rename to charts/jumpserver/templates/web/deployment-web.yaml index bc5be10..a1b88cc 100644 --- a/charts/jumpserver/templates/web/deployment-nginx.yaml +++ b/charts/jumpserver/templates/web/deployment-web.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "web" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1 diff --git a/charts/jumpserver/templates/web/pvc-nginx-logs.yaml b/charts/jumpserver/templates/web/pvc-web-logs.yaml similarity index 100% rename from charts/jumpserver/templates/web/pvc-nginx-logs.yaml rename to charts/jumpserver/templates/web/pvc-web-logs.yaml diff --git a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml index c68e5d4..5bb5cb2 100644 --- a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml +++ b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml @@ -5,7 +5,7 @@ {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $imageOwner := $.Values.global.imageOwner | default "jumpserver" }} {{- $imageName := "xrdp" }} -{{- $imageTag := "v3.10.3" }} +{{- $imageTag := "$.Chart.AppVersion" }} {{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }} apiVersion: apps/v1