diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml index 399b51a..57ae08f 100644 --- a/charts/jumpserver/templates/celery/deployment-celery.yaml +++ b/charts/jumpserver/templates/celery/deployment-celery.yaml @@ -3,14 +3,14 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-celery" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }} {{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }} {{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }} {{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }} {{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }} {{- $imageName := $.Values.xpack.enabled | ternary "jumpserver/core-ee" "jumpserver/core-ce" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | 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 7507282..d350f67 100644 --- a/charts/jumpserver/templates/chen/deployment-chen.yaml +++ b/charts/jumpserver/templates/chen/deployment-chen.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-chen" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/chen" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | 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 caedb49..6b5550b 100644 --- a/charts/jumpserver/templates/core/deployment-core.yaml +++ b/charts/jumpserver/templates/core/deployment-core.yaml @@ -3,14 +3,14 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-core" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }} {{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }} {{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }} {{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }} {{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }} {{- $imageName := $.Values.xpack.enabled | ternary "jumpserver/core-ee" "jumpserver/core-ce" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | quote }} apiVersion: apps/v1 kind: Deployment diff --git a/charts/jumpserver/templates/kael/deployment-kael.yaml b/charts/jumpserver/templates/kael/deployment-kael.yaml index bb4a8a9..22b90ce 100644 --- a/charts/jumpserver/templates/kael/deployment-kael.yaml +++ b/charts/jumpserver/templates/kael/deployment-kael.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-kael" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/kael" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | 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 700ba22..03ac824 100644 --- a/charts/jumpserver/templates/koko/deployment-koko.yaml +++ b/charts/jumpserver/templates/koko/deployment-koko.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-koko" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/koko" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | 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 c6e1d12..ce11901 100644 --- a/charts/jumpserver/templates/lion/deployment-lion.yaml +++ b/charts/jumpserver/templates/lion/deployment-lion.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-lion" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/lion" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | 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 9a72fe3..a4b923b 100644 --- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml +++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml @@ -3,7 +3,6 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-magnus" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }} {{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }} {{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }} @@ -12,7 +11,8 @@ {{- $oraclePortStart := printf "%s" (include "jumpserver.magnus.oracle.port.start" $) | int }} {{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int }} {{- $imageName := "jumpserver/magnus" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | quote }} apiVersion: apps/v1 kind: Deployment diff --git a/charts/jumpserver/templates/pre-install-initdb.yaml b/charts/jumpserver/templates/pre-install-initdb.yaml index 40e43ff..cec33b3 100644 --- a/charts/jumpserver/templates/pre-install-initdb.yaml +++ b/charts/jumpserver/templates/pre-install-initdb.yaml @@ -2,9 +2,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-init-db" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := $.Values.xpack.enabled | ternary "jumpserver/core-ee" "jumpserver/core-ce" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | quote }} apiVersion: batch/v1 kind: Job diff --git a/charts/jumpserver/templates/razor/deployment-razor.yaml b/charts/jumpserver/templates/razor/deployment-razor.yaml index 1637765..53f5bb3 100644 --- a/charts/jumpserver/templates/razor/deployment-razor.yaml +++ b/charts/jumpserver/templates/razor/deployment-razor.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-razor" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/razor" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | 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 20ffae2..f348c9c 100644 --- a/charts/jumpserver/templates/video/deployment-video.yaml +++ b/charts/jumpserver/templates/video/deployment-video.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-video" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/video" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | quote }} apiVersion: apps/v1 kind: Deployment diff --git a/charts/jumpserver/templates/web/deployment-nginx.yaml b/charts/jumpserver/templates/web/deployment-nginx.yaml index d255119..df3123d 100644 --- a/charts/jumpserver/templates/web/deployment-nginx.yaml +++ b/charts/jumpserver/templates/web/deployment-nginx.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-web" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/web" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | 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 357f52a..c6540ab 100644 --- a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml +++ b/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml @@ -3,9 +3,9 @@ {{- $fullName := include "jumpserver.fullname" $ }} {{- $containerName := "jms-xrdp" }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }} -{{- $tag := $.Values.global.imageTag | default .image.tag }} {{- $imageName := "jumpserver/xrdp" }} -{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $tag | quote }} +{{- $imageTag := "v3.9.3" }} +{{- $imageWithTag := printf "%s/%s:%s" $registryName $imageName $imageTag | quote }} apiVersion: apps/v1 kind: Deployment diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml index b60544f..a4e4634 100644 --- a/charts/jumpserver/values.yaml +++ b/charts/jumpserver/values.yaml @@ -12,7 +12,6 @@ fullnameOverride: "" ## global: imageRegistry: "ghcr.io" - imageTag: v3.9.3 ## E.g. # imagePullSecrets: # - myRegistryKeySecretName @@ -84,7 +83,6 @@ core: image: registry: docker.io - tag: v3.9.3 pullPolicy: IfNotPresent env: @@ -169,7 +167,6 @@ koko: image: registry: docker.io - tag: v3.9.3 pullPolicy: IfNotPresent env: [] @@ -254,7 +251,6 @@ lion: image: registry: docker.io - tag: v3.9.3 pullPolicy: IfNotPresent env: @@ -339,7 +335,6 @@ magnus: image: registry: docker.io - tag: v3.9.3 pullPolicy: IfNotPresent env: [] @@ -423,7 +418,6 @@ chen: image: registry: docker.io - tag: v3.9.3 pullPolicy: IfNotPresent env: [] @@ -499,7 +493,6 @@ kael: image: registry: docker.io - tag: v3.9.3 pullPolicy: IfNotPresent env: [] @@ -577,7 +570,6 @@ xrdp: image: registry: registry.fit2cloud.com - tag: v3.9.3 pullPolicy: IfNotPresent env: [] @@ -651,7 +643,6 @@ razor: image: registry: registry.fit2cloud.com - tag: v3.9.3 pullPolicy: IfNotPresent env: [] @@ -725,7 +716,6 @@ video: image: registry: registry.fit2cloud.com - tag: v3.9.3 pullPolicy: IfNotPresent env: [] @@ -799,7 +789,6 @@ web: image: registry: docker.io - tag: v3.9.3 pullPolicy: IfNotPresent env: