github/jumpserver-charts
1
0
Fork 0
mirror of https://github.com/jumpserver/helm-charts.git synced 2025-08-28 19:43:56 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修正 omnidb 参数

Browse Source
This commit is contained in:
吴小白 2021-12-29 11:06:00 +08:00
parent eb1d7905b2
commit 729216e623
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
charts/jumpserver/configs/jms-web/default.conf
View File

@ -2,8 +2,7 @@
{{ $lion := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-lion" ($.Values.lion.service.web.port | toString) }} {{ $lion := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-lion" ($.Values.lion.service.web.port | toString) }}
{{ $coreweb := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.web.port | toString) }} {{ $coreweb := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.web.port | toString) }}
{{ $corews := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.ws.port | toString) }} {{ $corews := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.ws.port | toString) }}
{{ $omnidbweb := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-omnidb" ($.Values.omnidb.service.web.port | toString) }} {{ $omnidb := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-omnidb" ($.Values.omnidb.service.web.port | toString) }}
{{ $omnidbws := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-omnidb" ($.Values.omnidb.service.ws.port | toString) }}
server { server {
listen {{ $.Values.web.service.web.port }}; listen {{ $.Values.web.service.web.port }};
server_name _; server_name _;
@ -47,21 +46,9 @@ server {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
} }
location /omnidb/ws {
resolver 127.0.0.11 valid=30s;
set $upstream {{$omnidbws}};
proxy_pass $upstream$request_uri;
proxy_http_version 1.1;
proxy_buffering off;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
location /omnidb/ { location /omnidb/ {
resolver 127.0.0.11 valid=30s; resolver 127.0.0.11 valid=30s;
set $upstream {{$omnidbweb}}; set $upstream {{$omnidb}};
proxy_pass $upstream$request_uri; proxy_pass $upstream$request_uri;
proxy_buffering off; proxy_buffering off;
proxy_http_version 1.1; proxy_http_version 1.1;

5
charts/jumpserver/templates/omnidb/deployment-omnidb.yaml
View File

@ -48,8 +48,6 @@ spec:
value: "{{ $.Values.core.config.bootstrapToken }}" value: "{{ $.Values.core.config.bootstrapToken }}"
- name: LOG_LEVEL - name: LOG_LEVEL
value: "{{ .config.log.level }}" value: "{{ .config.log.level }}"
- name: websocket_port
value: "{{ .service.ws.port }}"
- name: listening_port - name: listening_port
value: "{{ .service.web.port }}" value: "{{ .service.web.port }}"
{{- with .env }} {{- with .env }}
@ -59,9 +57,6 @@ spec:
- name: web - name: web
containerPort: {{ .service.web.port }} containerPort: {{ .service.web.port }}
protocol: TCP protocol: TCP
- name: ws
containerPort: {{ .service.ws.port }}
protocol: TCP
livenessProbe: livenessProbe:
{{- toYaml .livenessProbe | nindent 12}} {{- toYaml .livenessProbe | nindent 12}}
readinessProbe: readinessProbe:

4
charts/jumpserver/templates/omnidb/service-omnidb.yaml
View File

@ -17,10 +17,6 @@ spec:
targetPort: web targetPort: web
protocol: TCP protocol: TCP
name: web name: web
- port: {{ .service.ws.port }}
targetPort: ws
protocol: TCP
name: ws
sessionAffinity: ClientIP sessionAffinity: ClientIP
sessionAffinityConfig: sessionAffinityConfig:
clientIP: clientIP:

2
charts/jumpserver/values.yaml
View File

@ -368,8 +368,6 @@ omnidb:
type: ClusterIP type: ClusterIP
web: web:
port: 8082 port: 8082
ws:
port: 8071
resources: {} resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious # We usually recommend not to specify default resources and to leave this as a conscious