feat(port): 更新端口类型

This commit is contained in:
xiaohu
2021-09-05 22:58:30 +08:00
parent a289478c5c
commit 0c930be273
5 changed files with 24 additions and 24 deletions

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -41,6 +41,13 @@ spec:
command:
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
ports:
- name: web
containerPort: {{ .service.web.port }}
protocol: TCP
- name: ssh
containerPort: {{ .service.ssh.port }}
protocol: TCP
env:
- name: CORE_HOST
value: http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
@@ -51,25 +58,19 @@ 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
- name: REDIS_HOST
value: "{{ $.Values.core.config.redis.host }}"
value: {{ include "jumpserver.redis.host" . | quote }}
- name: REDIS_PORT
value: "{{ $.Values.core.config.redis.port }}"
value: {{ include "jumpserver.redis.port" . | quote }}
- name: REDIS_PASSWORD
value: "{{ $.Values.core.config.redis.password }}"
value: {{ include "jumpserver.redis.password" . | quote }}
{{- with .env }}
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
ports:
- name: web
containerPort: {{ .service.web.port }}
protocol: TCP
- name: ssh
containerPort: {{ .service.ssh.port }}
protocol: TCP
livenessProbe:
{{- toYaml .livenessProbe | nindent 12}}
readinessProbe:
@@ -103,4 +104,3 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -41,6 +41,10 @@ spec:
command:
{{- tpl (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}}
@@ -49,22 +53,19 @@ 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 }}
- name: REDIS_HOST
value: "{{ $.Values.core.config.redis.host }}"
value: {{ include "jumpserver.redis.host" . | quote }}
- name: REDIS_PORT
value: "{{ $.Values.core.config.redis.port }}"
value: {{ include "jumpserver.redis.port" . | quote }}
- name: REDIS_PASSWORD
value: "{{ $.Values.core.config.redis.password }}"
value: {{ include "jumpserver.redis.password" . | quote }}
{{- with .env }}
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
ports:
- name: web
containerPort: {{ .service.web.port }}
protocol: TCP
livenessProbe:
{{- toYaml .livenessProbe | nindent 12}}
readinessProbe:
@@ -98,4 +99,3 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -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 }}