diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/helm.iml b/.idea/helm.iml
new file mode 100644
index 0000000..5e764c4
--- /dev/null
+++ b/.idea/helm.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..a5fed1f
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Chart.yaml b/Chart.yaml
index c54806c..fa0038f 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,14 +1,5 @@
apiVersion: v1
appVersion: "v2.13.2"
description: A Helm chart for Deploying Jumpserver on Kubernetes
-dependencies:
-- condition: mysql.enabled
- name: mysql
- repository: https://github.com/bitnami/charts/tree/master/bitnami/mysql
- version: 8.8.3
-- condition: redis.enabled
- name: redis
- repository: https://github.com/bitnami/charts/tree/master/bitnami/redis
- version: 14.8.8
name: jumpserver
version: 0.1.0
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 7a9aa2e..1f17059 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -70,80 +70,44 @@ Define JumpServer database
{{- end -}}
{{- define "jumpserver.database.host" -}}
-{{- if eq .Values.mysql.enabled true -}}
-{{- template "jumpserver.mysql.fullname" . }}
-{{- else -}}
{{- .Values.externalDatabase.host -}}
{{- end -}}
-{{- end -}}
{{- define "jumpserver.database.port" -}}
-{{- if eq .Values.mysql.enabled true -}}
-{{- printf "%s" "5432" -}}
-{{- else -}}
{{- .Values.externalDatabase.port -}}
{{- end -}}
-{{- end -}}
{{- define "jumpserver.database.user" -}}
-{{- if eq .Values.mysql.enabled true -}}
-{{- .Values.mysql.user -}}
-{{- else -}}
{{- .Values.externalDatabase.user -}}
{{- end -}}
-{{- end -}}
{{- define "jumpserver.database.password" -}}
-{{- if eq .Values.mysql.enabled true -}}
-{{- .Values.mysql.password -}}
-{{- else -}}
{{- .Values.externalDatabase.password -}}
{{- end -}}
-{{- end -}}
{{- define "jumpserver.database.engine" -}}
-{{- if eq .Values.mysql.enabled true -}}
-{{- .Values.mysql.engine -}}
-{{- else -}}
{{- .Values.externalDatabase.engine -}}
{{- end -}}
-{{- end -}}
{{- define "jumpserver.database.database" -}}
-{{- if eq .Values.mysql.enabled true -}}
-{{- .Values.mysql.database -}}
-{{- else -}}
{{- .Values.externalDatabase.database -}}
{{- end -}}
-{{- end -}}
{{/*
Define JumpServer redis
*/}}
{{- define "jumpserver.redis.host" -}}
-{{- if eq .Values.redis.enabled true -}}
-{{- template "jumpserver.redis.fullname" . }}
-{{- else -}}
{{- .Values.externalRedis.host -}}
{{- end -}}
-{{- end -}}
{{- define "jumpserver.redis.port" -}}
-{{- if eq .Values.redis.enabled true -}}
-{{- .Values.redis.port -}}
-{{- else -}}
{{- .Values.externalRedis.port -}}
{{- end -}}
-{{- end -}}
{{- define "jumpserver.redis.password" -}}
-{{- if eq .Values.redis.enabled true -}}
-{{- .Values.redis.password -}}
-{{- else -}}
{{- .Values.externalRedis.password -}}
{{- end -}}
-{{- end -}}
{{/*
Define JumpServer StorageClass
diff --git a/templates/celery/deployment-celery.yaml b/templates/celery/deployment-celery.yaml
index f7c3a63..70ab462 100644
--- a/templates/celery/deployment-celery.yaml
+++ b/templates/celery/deployment-celery.yaml
@@ -49,7 +49,7 @@ spec:
- name: SESSION_EXPIRE_AT_BROWSER_CLOSE
value: "true"
- name: HTTP_LISTEN_PORT
- value: {{ .service.web.port }}
+ value: "{{ .service.web.port }}"
- name: WS_LISTEN_PORT
value: "{{ .service.ws.port }}"
{{- end }}
diff --git a/templates/core/deployment-core.yaml b/templates/core/deployment-core.yaml
index 75fdf79..d05d85d 100644
--- a/templates/core/deployment-core.yaml
+++ b/templates/core/deployment-core.yaml
@@ -54,7 +54,7 @@ spec:
- name: SESSION_EXPIRE_AT_BROWSER_CLOSE
value: "true"
- name: HTTP_LISTEN_PORT
- value: {{ .service.web.port }}
+ value: "{{ .service.web.port }}"
- name: WS_LISTEN_PORT
value: "{{ .service.ws.port }}"
{{- end }}
diff --git a/templates/koko/deployment-koko.yaml b/templates/koko/deployment-koko.yaml
index 681cbd2..9e78f62 100644
--- a/templates/koko/deployment-koko.yaml
+++ b/templates/koko/deployment-koko.yaml
@@ -58,7 +58,7 @@ spec:
- name: SSHD_PORT
value: "{{ .service.ssh.port }}"
- name: HTTPD_PORT
- value: {{ .service.web.port }}
+ value: "{{ .service.web.port }}"
{{- end }}
- name: SHARE_ROOM_TYPE
value: redis
diff --git a/templates/lion/deployment-lion.yaml b/templates/lion/deployment-lion.yaml
index 5d647ee..09a09b2 100644
--- a/templates/lion/deployment-lion.yaml
+++ b/templates/lion/deployment-lion.yaml
@@ -53,7 +53,7 @@ spec:
- name: LOG_LEVEL
value: "{{ .config.log.level }}"
- name: HTTPD_PORT
- value: {{ .service.web.port }}
+ value: "{{ .service.web.port }}"
- name: SHARE_ROOM_TYPE
value: redis
{{- end }}
diff --git a/templates/omnidb/deployment-omnidb.yaml b/templates/omnidb/deployment-omnidb.yaml
index c5a91e3..94dc103 100644
--- a/templates/omnidb/deployment-omnidb.yaml
+++ b/templates/omnidb/deployment-omnidb.yaml
@@ -51,7 +51,7 @@ spec:
- name: websocket_port
value: "{{ .service.ws.port }}"
- name: listening_port
- value: {{ .service.web.port }}
+ value: "{{ .service.web.port }}"
{{- with .env }}
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
diff --git a/values.yaml b/values.yaml
index 6b579bc..768a1da 100644
--- a/values.yaml
+++ b/values.yaml
@@ -19,19 +19,6 @@ global:
imagePullSecrets: []
storageClass: ""
-redis:
- enabled: true
- port: 6379
- password: "123"
-
-mysql:
- engine: mysql
- enabled: true
- port: 3306
- user: jumpserver
- password: "123"
- database: jms-db
-
## If the Redis database included in the chart is disabled, JumpServer will
## use below parameters to connect to an external Redis server.
##