perf: 固定镜像名称

jumpserver · Dec 15, 2023 · a104bba · a104bba
1 parent beaaefa
commit a104bba
Show file tree

Hide file tree

Showing 36 changed files with 205 additions and 322 deletions.
diff --git a/charts/jumpserver/templates/_images.tpl b/charts/jumpserver/templates/_images.tpl
diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml
@@ -1,17 +1,21 @@
 {{- if .Values.core.enabled }}
 {{- with .Values.core }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-celery" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
 {{- $containerName := "jms-celery" }}
-{{- $image := printf "%s" (include "jumpserver.coreImage" $) }}
+{{- $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 }}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-{{ $containerName }}"
   labels:
     app.jumpserver.org/name: {{ $containerName }}
 spec:
@@ -39,12 +43,8 @@ spec:
         - name: {{ $containerName }}
           securityContext:
             {{- toYaml .securityContext | nindent 12 }}
-          image: {{ $image }}
-          imagePullPolicy: {{ .image.pullPolicy }}
-          {{- with .command }}
-          command:
-            {{- tpl (toYaml .) $ | nindent 12 }}
-          {{- end }}
+          image: {{ $imageWithTag }}
+          imagePullPolicy: {{ .image.pullPolicy | quote }}
           args: ["start", "task"]
           env:
             - name: SECRET_KEY
@@ -121,7 +121,7 @@ spec:
             {{- if .persistence.existingClaim }}
             claimName: {{ .persistence.existingClaim | quote }}
             {{- else }}
-            claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            claimName: '{{ $fullName }}-jms-core-data'
             {{- end }}
           name: "jms-core-data"
       {{- with .volumes }}
@@ -140,4 +140,4 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/jumpserver/templates/chen/deployment-chen.yaml b/charts/jumpserver/templates/chen/deployment-chen.yaml
@@ -1,12 +1,16 @@
 {{- if .Values.chen.enabled }}
 {{- with .Values.chen }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-chen" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
 {{- $containerName := "jms-chen" }}
-{{- $image := printf "%s" (include "jumpserver.chenImage" $) }}
+{{- $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 }}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-{{ $containerName }}"
   labels:
     {{- include "jumpserver.labels" $ | nindent 4 }}
     {{- toYaml .labels | nindent 4 }}
@@ -35,15 +39,11 @@ spec:
         - name: {{ $containerName }}
           securityContext:
             {{- toYaml .securityContext | nindent 12 }}
-          image: {{ $image }}
-          imagePullPolicy: {{ .image.pullPolicy }}
-          {{- with .command }}
-          command:
-            {{- tpl (toYaml .) $ | nindent 12 }}
-          {{- end }}
+          image: {{ $imageWithTag }}
+          imagePullPolicy: {{ .image.pullPolicy | quote }}
           env:
             - name: CORE_HOST
-              value: "http://{{ include "jumpserver.fullname" $ }}-jms-core:{{ $.Values.core.service.web.port }}"
+              value: "http://{{ $fullName }}-jms-core:{{ $.Values.core.service.web.port }}"
             - name: BOOTSTRAP_TOKEN
               value: {{ $.Values.core.config.bootstrapToken | quote }}
             - name: LOG_LEVEL
@@ -79,7 +79,7 @@ spec:
             {{- if .persistence.existingClaim }}
             claimName: {{ .persistence.existingClaim | quote }}
             {{- else }}
-            claimName: '{{ include "jumpserver.fullname" $ }}-jms-chen-data'
+            claimName: '{{ $fullName }}-jms-chen-data'
             {{- end }}
           name: "jms-chen-data"
       {{- with .volumes }}

diff --git a/charts/jumpserver/templates/chen/pvc-chen-data.yaml b/charts/jumpserver/templates/chen/pvc-chen-data.yaml
@@ -1,10 +1,11 @@
 {{- if and .Values.chen.enabled (not .Values.chen.persistence.existingClaim)}}
 {{- with .Values.chen }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-chen-data" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
+
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-jms-chen-data"
   labels:
     {{- include "jumpserver.labels" $ | nindent 4 }}
     {{- toYaml .labels | nindent 4 }}

diff --git a/charts/jumpserver/templates/chen/service-chen.yaml b/charts/jumpserver/templates/chen/service-chen.yaml
@@ -1,10 +1,11 @@
 {{- if .Values.chen.enabled }}
 {{- with .Values.chen }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-chen" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
+
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-jms-chen"
   labels:
     {{- include "jumpserver.labels" $ | nindent 4 }}
     {{- toYaml .labels | nindent 4 }}

diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml
@@ -1,17 +1,21 @@
 {{- if .Values.core.enabled }}
 {{- with .Values.core }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-core" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
 {{- $containerName := "jms-core" }}
-{{- $image := printf "%s" (include "jumpserver.coreImage" $) }}
+{{- $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 }}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-{{ $containerName }}"
   labels:
     {{- include "jumpserver.labels" $ | nindent 4 }}
     {{- toYaml .labels | nindent 4 }}
@@ -40,16 +44,12 @@ spec:
         - name: {{ $containerName }}
           securityContext:
             {{- toYaml .securityContext | nindent 12 }}
-          image: {{ $image }}
-          imagePullPolicy: {{ .image.pullPolicy }}
-          {{- with .command }}
-          command:
-            {{- tpl (toYaml .) $ | nindent 12 }}
-          {{- end }}
+          image: {{ $imageWithTag }}
+          imagePullPolicy: {{ .image.pullPolicy | quote }}
           args: ["start", "web"]
           env:
             - name: CORE_HOST
-              value: "http://{{ include "jumpserver.fullname" $ }}-jms-core:{{ $.Values.core.service.web.port }}"
+              value: "http://{{ $fullName }}-jms-core:{{ $.Values.core.service.web.port }}"
             - name: SECRET_KEY
               value: {{ required "A valid secretKey is required!" .config.secretKey | quote }}
             - name: BOOTSTRAP_TOKEN
@@ -117,7 +117,7 @@ spec:
             {{- if .persistence.existingClaim }}
             claimName: {{ .persistence.existingClaim | quote }}
             {{- else }}
-            claimName: '{{ include "jumpserver.fullname" $ }}-jms-core-data'
+            claimName: '{{ $fullName }}-jms-core-data'
             {{- end }}
           name: "jms-core-data"
       {{- with .volumes }}

diff --git a/charts/jumpserver/templates/core/pvc-core-data.yaml b/charts/jumpserver/templates/core/pvc-core-data.yaml
@@ -1,10 +1,11 @@
 {{- if and .Values.core.enabled (not .Values.core.persistence.existingClaim)}}
 {{- with .Values.core }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-core-data" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
+
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-jms-core-data"
   labels:
     {{- include "jumpserver.labels" $ | nindent 4 }}
     {{- toYaml .labels | nindent 4 }}

diff --git a/charts/jumpserver/templates/core/service-core.yaml b/charts/jumpserver/templates/core/service-core.yaml
@@ -1,10 +1,11 @@
 {{- if .Values.core.enabled }}
 {{- with .Values.core }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-core" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
+
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-jms-core"
   labels:
     {{- include "jumpserver.labels" $ | nindent 4 }}
     {{- toYaml .labels | nindent 4 }}

diff --git a/charts/jumpserver/templates/kael/deployment-kael.yaml b/charts/jumpserver/templates/kael/deployment-kael.yaml
@@ -1,12 +1,16 @@
 {{- if .Values.kael.enabled }}
 {{- with .Values.kael }}
-{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-kael" }}
+{{- $fullName := include "jumpserver.fullname" $ }}
 {{- $containerName := "jms-kael" }}
-{{- $image := printf "%s" (include "jumpserver.kaelImage" $) }}
+{{- $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 }}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ $fullName }}
+  name: "{{ $fullName }}-{{ $containerName }}"
   labels:
     {{- include "jumpserver.labels" $ | nindent 4 }}
     {{- toYaml .labels | nindent 4 }}
@@ -35,19 +39,18 @@ spec:
         - name: {{ $containerName }}
           securityContext:
             {{- toYaml .securityContext | nindent 12 }}
-          image: {{ $image }}
-          imagePullPolicy: {{ .image.pullPolicy }}
+          image: {{ $imageWithTag }}
+          imagePullPolicy: {{ .image.pullPolicy | quote }}
           {{- with .command }}
-          command:
-            {{- tpl (toYaml .) $ | nindent 12 }}
+          command: {{ toYaml . | nindent 12 }}
           {{- end }}
           ports:
             - name: web
               containerPort: {{ .service.web.port }}
               protocol: TCP
           env:
             - name: CORE_HOST
-              value: "http://{{ include "jumpserver.fullname" $ }}-jms-core:{{ $.Values.core.service.web.port }}"
+              value: "http://{{ $fullName }}-jms-core:{{ $.Values.core.service.web.port }}"
             - name: BOOTSTRAP_TOKEN
               value: {{ $.Values.core.config.bootstrapToken | quote }}
             - name: LOG_LEVEL
@@ -87,7 +90,7 @@ spec:
             {{- if .persistence.existingClaim }}
             claimName: {{ .persistence.existingClaim | quote }}
             {{- else }}
-            claimName: '{{ include "jumpserver.fullname" $ }}-jms-kael-data'
+            claimName: '{{ $fullName }}-jms-kael-data'
             {{- end }}
           name: "jms-kael-data"
       {{- with .volumes }}
@@ -106,4 +109,4 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}