perf: 固定镜像版本

This commit is contained in:
吴小白 2023-12-16 17:31:17 +08:00
parent a104bba694
commit 4206649b47
13 changed files with 24 additions and 35 deletions

View File

@ -3,14 +3,14 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-celery" }} {{- $containerName := "jms-celery" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }} {{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }}
{{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }} {{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }}
{{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }} {{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }}
{{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }} {{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }}
{{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }} {{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }}
{{- $imageName := $.Values.xpack.enabled | ternary "jumpserver/core-ee" "jumpserver/core-ce" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-chen" }} {{- $containerName := "jms-chen" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/chen" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,14 +3,14 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-core" }} {{- $containerName := "jms-core" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }} {{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }}
{{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }} {{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }}
{{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }} {{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }}
{{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }} {{- $postgresqlPort := printf "%s" (include "jumpserver.magnus.postgresql.port" $) }}
{{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }} {{- $oraclePorts := printf "%s" (include "jumpserver.magnus.oracle.ports" $) }}
{{- $imageName := $.Values.xpack.enabled | ternary "jumpserver/core-ee" "jumpserver/core-ce" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-kael" }} {{- $containerName := "jms-kael" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/kael" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-koko" }} {{- $containerName := "jms-koko" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/koko" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-lion" }} {{- $containerName := "jms-lion" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/lion" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,7 +3,6 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-magnus" }} {{- $containerName := "jms-magnus" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }} {{- $mysqlPort := printf "%s" (include "jumpserver.magnus.mysql.port" $) }}
{{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }} {{- $mariadbPort := printf "%s" (include "jumpserver.magnus.mariadb.port" $) }}
{{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }} {{- $redisPort := printf "%s" (include "jumpserver.magnus.redis.port" $) }}
@ -12,7 +11,8 @@
{{- $oraclePortStart := printf "%s" (include "jumpserver.magnus.oracle.port.start" $) | int }} {{- $oraclePortStart := printf "%s" (include "jumpserver.magnus.oracle.port.start" $) | int }}
{{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int }} {{- $oraclePortEnd := printf "%s" (include "jumpserver.magnus.oracle.port.end" $) | int }}
{{- $imageName := "jumpserver/magnus" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -2,9 +2,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-init-db" }} {{- $containerName := "jms-init-db" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $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" }} {{- $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 apiVersion: batch/v1
kind: Job kind: Job

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-razor" }} {{- $containerName := "jms-razor" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/razor" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-video" }} {{- $containerName := "jms-video" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/video" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-web" }} {{- $containerName := "jms-web" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/web" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -3,9 +3,9 @@
{{- $fullName := include "jumpserver.fullname" $ }} {{- $fullName := include "jumpserver.fullname" $ }}
{{- $containerName := "jms-xrdp" }} {{- $containerName := "jms-xrdp" }}
{{- $registryName := $.Values.global.imageRegistry | default .image.registry }} {{- $registryName := $.Values.global.imageRegistry | default .image.registry }}
{{- $tag := $.Values.global.imageTag | default .image.tag }}
{{- $imageName := "jumpserver/xrdp" }} {{- $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 apiVersion: apps/v1
kind: Deployment kind: Deployment

View File

@ -12,7 +12,6 @@ fullnameOverride: ""
## ##
global: global:
imageRegistry: "ghcr.io" imageRegistry: "ghcr.io"
imageTag: v3.9.3
## E.g. ## E.g.
# imagePullSecrets: # imagePullSecrets:
# - myRegistryKeySecretName # - myRegistryKeySecretName
@ -84,7 +83,6 @@ core:
image: image:
registry: docker.io registry: docker.io
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: env:
@ -169,7 +167,6 @@ koko:
image: image:
registry: docker.io registry: docker.io
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: [] env: []
@ -254,7 +251,6 @@ lion:
image: image:
registry: docker.io registry: docker.io
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: env:
@ -339,7 +335,6 @@ magnus:
image: image:
registry: docker.io registry: docker.io
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: [] env: []
@ -423,7 +418,6 @@ chen:
image: image:
registry: docker.io registry: docker.io
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: [] env: []
@ -499,7 +493,6 @@ kael:
image: image:
registry: docker.io registry: docker.io
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: [] env: []
@ -577,7 +570,6 @@ xrdp:
image: image:
registry: registry.fit2cloud.com registry: registry.fit2cloud.com
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: [] env: []
@ -651,7 +643,6 @@ razor:
image: image:
registry: registry.fit2cloud.com registry: registry.fit2cloud.com
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: [] env: []
@ -725,7 +716,6 @@ video:
image: image:
registry: registry.fit2cloud.com registry: registry.fit2cloud.com
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: [] env: []
@ -799,7 +789,6 @@ web:
image: image:
registry: docker.io registry: docker.io
tag: v3.9.3
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
env: env: