mirror of
https://github.com/jumpserver/helm-charts.git
synced 2025-08-31 22:50:59 +00:00
feat(port): 更新端口类型
This commit is contained in:
@@ -49,7 +49,7 @@ spec:
|
|||||||
- name: SESSION_EXPIRE_AT_BROWSER_CLOSE
|
- name: SESSION_EXPIRE_AT_BROWSER_CLOSE
|
||||||
value: "true"
|
value: "true"
|
||||||
- name: HTTP_LISTEN_PORT
|
- name: HTTP_LISTEN_PORT
|
||||||
value: "{{ .service.web.port }}"
|
value: {{ .service.web.port }}
|
||||||
- name: WS_LISTEN_PORT
|
- name: WS_LISTEN_PORT
|
||||||
value: "{{ .service.ws.port }}"
|
value: "{{ .service.ws.port }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@@ -54,7 +54,7 @@ spec:
|
|||||||
- name: SESSION_EXPIRE_AT_BROWSER_CLOSE
|
- name: SESSION_EXPIRE_AT_BROWSER_CLOSE
|
||||||
value: "true"
|
value: "true"
|
||||||
- name: HTTP_LISTEN_PORT
|
- name: HTTP_LISTEN_PORT
|
||||||
value: "{{ .service.web.port }}"
|
value: {{ .service.web.port }}
|
||||||
- name: WS_LISTEN_PORT
|
- name: WS_LISTEN_PORT
|
||||||
value: "{{ .service.ws.port }}"
|
value: "{{ .service.ws.port }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@@ -41,6 +41,13 @@ spec:
|
|||||||
command:
|
command:
|
||||||
{{- tpl (toYaml .) $ | nindent 12 }}
|
{{- tpl (toYaml .) $ | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
ports:
|
||||||
|
- name: web
|
||||||
|
containerPort: {{ .service.web.port }}
|
||||||
|
protocol: TCP
|
||||||
|
- name: ssh
|
||||||
|
containerPort: {{ .service.ssh.port }}
|
||||||
|
protocol: TCP
|
||||||
env:
|
env:
|
||||||
- name: CORE_HOST
|
- name: CORE_HOST
|
||||||
value: http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
|
value: http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
|
||||||
@@ -51,25 +58,19 @@ spec:
|
|||||||
- name: SSHD_PORT
|
- name: SSHD_PORT
|
||||||
value: "{{ .service.ssh.port }}"
|
value: "{{ .service.ssh.port }}"
|
||||||
- name: HTTPD_PORT
|
- name: HTTPD_PORT
|
||||||
value: "{{ .service.web.port }}"
|
value: {{ .service.web.port }}
|
||||||
|
{{- end }}
|
||||||
- name: SHARE_ROOM_TYPE
|
- name: SHARE_ROOM_TYPE
|
||||||
value: redis
|
value: redis
|
||||||
- name: REDIS_HOST
|
- name: REDIS_HOST
|
||||||
value: "{{ $.Values.core.config.redis.host }}"
|
value: {{ include "jumpserver.redis.host" . | quote }}
|
||||||
- name: REDIS_PORT
|
- name: REDIS_PORT
|
||||||
value: "{{ $.Values.core.config.redis.port }}"
|
value: {{ include "jumpserver.redis.port" . | quote }}
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
value: "{{ $.Values.core.config.redis.password }}"
|
value: {{ include "jumpserver.redis.password" . | quote }}
|
||||||
{{- with .env }}
|
{{- with .env }}
|
||||||
{{- tpl (toYaml .) $ | nindent 12 }}
|
{{- tpl (toYaml .) $ | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
|
||||||
- name: web
|
|
||||||
containerPort: {{ .service.web.port }}
|
|
||||||
protocol: TCP
|
|
||||||
- name: ssh
|
|
||||||
containerPort: {{ .service.ssh.port }}
|
|
||||||
protocol: TCP
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
{{- toYaml .livenessProbe | nindent 12}}
|
{{- toYaml .livenessProbe | nindent 12}}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
@@ -103,4 +104,3 @@ spec:
|
|||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
|
||||||
|
@@ -41,6 +41,10 @@ spec:
|
|||||||
command:
|
command:
|
||||||
{{- tpl (toYaml .) $ | nindent 12 }}
|
{{- tpl (toYaml .) $ | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
ports:
|
||||||
|
- name: web
|
||||||
|
containerPort: {{ .service.web.port }}
|
||||||
|
protocol: TCP
|
||||||
env:
|
env:
|
||||||
- name: CORE_HOST
|
- name: CORE_HOST
|
||||||
value: http://{{ include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
|
value: http://{{ include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
|
||||||
@@ -49,22 +53,19 @@ spec:
|
|||||||
- name: LOG_LEVEL
|
- name: LOG_LEVEL
|
||||||
value: "{{ .config.log.level }}"
|
value: "{{ .config.log.level }}"
|
||||||
- name: HTTPD_PORT
|
- name: HTTPD_PORT
|
||||||
value: "{{ .service.web.port }}"
|
value: {{ .service.web.port }}
|
||||||
- name: SHARE_ROOM_TYPE
|
- name: SHARE_ROOM_TYPE
|
||||||
value: redis
|
value: redis
|
||||||
|
{{- end }}
|
||||||
- name: REDIS_HOST
|
- name: REDIS_HOST
|
||||||
value: "{{ $.Values.core.config.redis.host }}"
|
value: {{ include "jumpserver.redis.host" . | quote }}
|
||||||
- name: REDIS_PORT
|
- name: REDIS_PORT
|
||||||
value: "{{ $.Values.core.config.redis.port }}"
|
value: {{ include "jumpserver.redis.port" . | quote }}
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
value: "{{ $.Values.core.config.redis.password }}"
|
value: {{ include "jumpserver.redis.password" . | quote }}
|
||||||
{{- with .env }}
|
{{- with .env }}
|
||||||
{{- tpl (toYaml .) $ | nindent 12 }}
|
{{- tpl (toYaml .) $ | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
|
||||||
- name: web
|
|
||||||
containerPort: {{ .service.web.port }}
|
|
||||||
protocol: TCP
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
{{- toYaml .livenessProbe | nindent 12}}
|
{{- toYaml .livenessProbe | nindent 12}}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
@@ -98,4 +99,3 @@ spec:
|
|||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
|
||||||
|
@@ -51,7 +51,7 @@ spec:
|
|||||||
- name: websocket_port
|
- name: websocket_port
|
||||||
value: "{{ .service.ws.port }}"
|
value: "{{ .service.ws.port }}"
|
||||||
- name: listening_port
|
- name: listening_port
|
||||||
value: "{{ .service.web.port }}"
|
value: {{ .service.web.port }}
|
||||||
{{- with .env }}
|
{{- with .env }}
|
||||||
{{- tpl (toYaml .) $ | nindent 12 }}
|
{{- tpl (toYaml .) $ | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
Reference in New Issue
Block a user