From 1ddaf3f8f161d04269c5594057d4d903071a0561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Thu, 4 Jul 2024 13:19:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E9=95=9C=E5=83=8F=20t?=
 =?UTF-8?q?ag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charts/jumpserver/templates/celery/deployment-celery.yaml | 5 +++--
 charts/jumpserver/templates/chen/deployment-chen.yaml     | 3 ++-
 charts/jumpserver/templates/core/deployment-core.yaml     | 5 +++--
 charts/jumpserver/templates/koko/deployment-koko.yaml     | 3 ++-
 charts/jumpserver/templates/lion/deployment-lion.yaml     | 3 ++-
 charts/jumpserver/templates/magnus/deployment-magnus.yaml | 3 ++-
 charts/jumpserver/templates/razor/deployment-razor.yaml   | 3 ++-
 charts/jumpserver/templates/video/deployment-video.yaml   | 3 ++-
 charts/jumpserver/templates/web/deployment-web.yaml       | 3 ++-
 charts/jumpserver/templates/xrdp/deployment-xrdp.yaml     | 3 ++-
 10 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml
index 34b97dc..882d9d5 100644
--- a/charts/jumpserver/templates/celery/deployment-celery.yaml
+++ b/charts/jumpserver/templates/celery/deployment-celery.yaml
@@ -10,9 +10,10 @@
 {{- $sqlserverPort := printf "%s" (include "jumpserver.magnus.sqlserver.port" $) }}
 {{- $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" }}
+{{- $imageName := "core" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/chen/deployment-chen.yaml b/charts/jumpserver/templates/chen/deployment-chen.yaml
index c528978..fb09320 100644
--- a/charts/jumpserver/templates/chen/deployment-chen.yaml
+++ b/charts/jumpserver/templates/chen/deployment-chen.yaml
@@ -6,7 +6,8 @@
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "chen" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml
index 2e76f25..18e9d91 100644
--- a/charts/jumpserver/templates/core/deployment-core.yaml
+++ b/charts/jumpserver/templates/core/deployment-core.yaml
@@ -10,9 +10,10 @@
 {{- $sqlserverPort := printf "%s" (include "jumpserver.magnus.sqlserver.port" $) }}
 {{- $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" }}
+{{- $imageName := "core" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/koko/deployment-koko.yaml b/charts/jumpserver/templates/koko/deployment-koko.yaml
index 2a0ed3e..54a4cbc 100644
--- a/charts/jumpserver/templates/koko/deployment-koko.yaml
+++ b/charts/jumpserver/templates/koko/deployment-koko.yaml
@@ -6,7 +6,8 @@
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "koko" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/lion/deployment-lion.yaml b/charts/jumpserver/templates/lion/deployment-lion.yaml
index f843a1d..5c8eb1f 100644
--- a/charts/jumpserver/templates/lion/deployment-lion.yaml
+++ b/charts/jumpserver/templates/lion/deployment-lion.yaml
@@ -6,7 +6,8 @@
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "lion" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
index 5f44d94..c2e8ce4 100644
--- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
@@ -13,7 +13,8 @@
 {{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int }}
 {{- $imageName := "magnus" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/razor/deployment-razor.yaml b/charts/jumpserver/templates/razor/deployment-razor.yaml
index 44f10bf..f312a13 100644
--- a/charts/jumpserver/templates/razor/deployment-razor.yaml
+++ b/charts/jumpserver/templates/razor/deployment-razor.yaml
@@ -6,7 +6,8 @@
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "razor" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/video/deployment-video.yaml b/charts/jumpserver/templates/video/deployment-video.yaml
index 9bd11b2..2a9b339 100644
--- a/charts/jumpserver/templates/video/deployment-video.yaml
+++ b/charts/jumpserver/templates/video/deployment-video.yaml
@@ -6,7 +6,8 @@
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "video-worker" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/web/deployment-web.yaml b/charts/jumpserver/templates/web/deployment-web.yaml
index 5c0a55c..efe33ad 100644
--- a/charts/jumpserver/templates/web/deployment-web.yaml
+++ b/charts/jumpserver/templates/web/deployment-web.yaml
@@ -6,7 +6,8 @@
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "web" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
index 57e94c8..507c58d 100644
--- a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
+++ b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml
@@ -6,7 +6,8 @@
 {{- $imageOwner :=  $.Values.global.imageOwner | default "jumpserver" }}
 {{- $imageName := "xrdp" }}
 {{- $imageTag := $.Chart.AppVersion }}
-{{- $imageWithTag := printf "%s/%s/%s:%s" $registryName $imageOwner $imageName $imageTag | quote }}
+{{- $imageSuffix := $.Values.xpack.enabled | ternary "ee" "ce" }}
+{{- $imageWithTag := printf "%s/%s/%s:v%s-%s" $registryName $imageOwner $imageName $imageTag $imageSuffix | quote }}
 
 apiVersion: apps/v1
 kind: Deployment