From beaaefa0ec70d33313ad33512087a6d321ef4a95 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, 30 Nov 2023 13:23:32 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charts/jumpserver/configs/jms-core/config.yml | 0 .../templates/celery/deployment-celery.yaml | 6 ------ .../jumpserver/templates/core/configmap-core.yaml | 15 --------------- .../templates/core/deployment-core.yaml | 6 ------ 4 files changed, 27 deletions(-) delete mode 100644 charts/jumpserver/configs/jms-core/config.yml delete mode 100644 charts/jumpserver/templates/core/configmap-core.yaml diff --git a/charts/jumpserver/configs/jms-core/config.yml b/charts/jumpserver/configs/jms-core/config.yml deleted file mode 100644 index e69de29..0000000 diff --git a/charts/jumpserver/templates/celery/deployment-celery.yaml b/charts/jumpserver/templates/celery/deployment-celery.yaml index 41dfcd8..26d7bbc 100644 --- a/charts/jumpserver/templates/celery/deployment-celery.yaml +++ b/charts/jumpserver/templates/celery/deployment-celery.yaml @@ -107,9 +107,6 @@ spec: resources: {{- toYaml .resources | nindent 12 }} volumeMounts: - - mountPath: "/opt/jumpserver/config.yml" - name: "jms-core-config" - subPath: "config.yml" - mountPath: "/opt/jumpserver/data" name: "jms-core-data" {{- if .persistence.subPath }} @@ -120,9 +117,6 @@ spec: {{- end }} restartPolicy: Always volumes: - - configMap: - name: '{{ include "jumpserver.fullname" $ }}-jms-core' - name: "jms-core-config" - persistentVolumeClaim: {{- if .persistence.existingClaim }} claimName: {{ .persistence.existingClaim | quote }} diff --git a/charts/jumpserver/templates/core/configmap-core.yaml b/charts/jumpserver/templates/core/configmap-core.yaml deleted file mode 100644 index 7266085..0000000 --- a/charts/jumpserver/templates/core/configmap-core.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.core.enabled }} -{{- with .Values.core }} -{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-core" }} -kind: ConfigMap -apiVersion: v1 -metadata: - name: {{ $fullName }} - labels: - {{- include "jumpserver.labels" $ | nindent 4 }} - {{- toYaml .labels | nindent 4 }} -data: -{{- $path := printf "%s/%s/%s" "configs" "jms-core" "config.yml" -}} -{{- tpl (( $.Files.Glob $path ).AsConfig) $ | nindent 2 }} -{{- end }} -{{- end }} diff --git a/charts/jumpserver/templates/core/deployment-core.yaml b/charts/jumpserver/templates/core/deployment-core.yaml index 95b5248..7eb4a19 100644 --- a/charts/jumpserver/templates/core/deployment-core.yaml +++ b/charts/jumpserver/templates/core/deployment-core.yaml @@ -103,9 +103,6 @@ spec: resources: {{- toYaml .resources | nindent 12 }} volumeMounts: - - mountPath: "/opt/jumpserver/config.yml" - name: "jms-core-config" - subPath: "config.yml" - mountPath: "/opt/jumpserver/data" name: "jms-core-data" {{- if .persistence.subPath }} @@ -116,9 +113,6 @@ spec: {{- end }} restartPolicy: Always volumes: - - configMap: - name: '{{ include "jumpserver.fullname" $ }}-jms-core' - name: "jms-core-config" - persistentVolumeClaim: {{- if .persistence.existingClaim }} claimName: {{ .persistence.existingClaim | quote }}