From 6f07b7a2aec960b131444704ca5f70bb464fb717 Mon Sep 17 00:00:00 2001
From: Jangrui <admin@jangrui.com>
Date: Fri, 24 Feb 2023 12:07:00 +0800
Subject: [PATCH] PVC is not created existingClaim it exists.

---
 charts/jumpserver/templates/core/pvc-core-data.yaml     | 2 +-
 charts/jumpserver/templates/koko/pvc-koko-data.yaml     | 2 +-
 charts/jumpserver/templates/lion/pvc-lion-data.yaml     | 2 +-
 charts/jumpserver/templates/magnus/pvc-magnus-data.yaml | 2 +-
 charts/jumpserver/templates/omnidb/pvc-omnidb-data.yaml | 2 +-
 charts/jumpserver/templates/razor/pvc-razor-data.yaml   | 2 +-
 charts/jumpserver/templates/web/pvc-nginx-logs.yaml     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/jumpserver/templates/core/pvc-core-data.yaml b/charts/jumpserver/templates/core/pvc-core-data.yaml
index 5ea2009..8dda8f9 100644
--- a/charts/jumpserver/templates/core/pvc-core-data.yaml
+++ b/charts/jumpserver/templates/core/pvc-core-data.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.core.enabled }}
+{{- if and .Values.core.enabled (not .Values.core.persistence.existingClaim)}}
 {{- with .Values.core }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-core-data" }}
 apiVersion: v1
diff --git a/charts/jumpserver/templates/koko/pvc-koko-data.yaml b/charts/jumpserver/templates/koko/pvc-koko-data.yaml
index 497775d..adb54a2 100644
--- a/charts/jumpserver/templates/koko/pvc-koko-data.yaml
+++ b/charts/jumpserver/templates/koko/pvc-koko-data.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.koko.enabled }}
+{{- if and .Values.koko.enabled (not .Values.koko.persistence.existingClaim)}}
 {{- with .Values.koko }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-koko-data" }}
 apiVersion: v1
diff --git a/charts/jumpserver/templates/lion/pvc-lion-data.yaml b/charts/jumpserver/templates/lion/pvc-lion-data.yaml
index 6e641c8..6ee575b 100644
--- a/charts/jumpserver/templates/lion/pvc-lion-data.yaml
+++ b/charts/jumpserver/templates/lion/pvc-lion-data.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.lion.enabled }}
+{{- if and .Values.lion.enabled (not .Values.lion.persistence.existingClaim)}}
 {{- with .Values.lion }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-lion-data" }}
 apiVersion: v1
diff --git a/charts/jumpserver/templates/magnus/pvc-magnus-data.yaml b/charts/jumpserver/templates/magnus/pvc-magnus-data.yaml
index ca27a8f..533b0fb 100644
--- a/charts/jumpserver/templates/magnus/pvc-magnus-data.yaml
+++ b/charts/jumpserver/templates/magnus/pvc-magnus-data.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.magnus.enabled }}
+{{- if and .Values.magnus.enabled (not .Values.magnus.persistence.existingClaim)}}
 {{- with .Values.magnus }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-magnus-data" }}
 apiVersion: v1
diff --git a/charts/jumpserver/templates/omnidb/pvc-omnidb-data.yaml b/charts/jumpserver/templates/omnidb/pvc-omnidb-data.yaml
index 92d066f..e305178 100644
--- a/charts/jumpserver/templates/omnidb/pvc-omnidb-data.yaml
+++ b/charts/jumpserver/templates/omnidb/pvc-omnidb-data.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.xpack.enabled }}
+{{- if and .Values.xpack.enabled (not .Values.omnidb.persistence.existingClaim)}}
 {{- with .Values.omnidb }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-omnidb-data" }}
 apiVersion: v1
diff --git a/charts/jumpserver/templates/razor/pvc-razor-data.yaml b/charts/jumpserver/templates/razor/pvc-razor-data.yaml
index f9fc92e..915676b 100644
--- a/charts/jumpserver/templates/razor/pvc-razor-data.yaml
+++ b/charts/jumpserver/templates/razor/pvc-razor-data.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.xpack.enabled }}
+{{- if and .Values.xpack.enabled (not .Values.razor.persistence.existingClaim)}}
 {{- with .Values.razor }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-razor-data" }}
 apiVersion: v1
diff --git a/charts/jumpserver/templates/web/pvc-nginx-logs.yaml b/charts/jumpserver/templates/web/pvc-nginx-logs.yaml
index eafe157..d4e0b97 100644
--- a/charts/jumpserver/templates/web/pvc-nginx-logs.yaml
+++ b/charts/jumpserver/templates/web/pvc-nginx-logs.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.web.enabled }}
+{{- if and .Values.web.enabled (not .Values.web.persistence.existingClaim)}}
 {{- with .Values.web }}
 {{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-web-logs" }}
 apiVersion: v1