diff --git a/charts/jumpserver/templates/_helpers.tpl b/charts/jumpserver/templates/_helpers.tpl index f206186..4169cb7 100644 --- a/charts/jumpserver/templates/_helpers.tpl +++ b/charts/jumpserver/templates/_helpers.tpl @@ -153,11 +153,11 @@ Define JumpServer StorageClass {{- end -}} {{- end -}} -{{- define "jumpserver.xrdp.storageClass" -}} +{{- define "jumpserver.razor.storageClass" -}} {{- if .Values.global.storageClass }} {{- .Values.global.storageClass }} {{- else -}} -{{- .Values.xrdp.persistence.storageClassName -}} +{{- .Values.razor.persistence.storageClassName -}} {{- end -}} {{- end -}} @@ -165,6 +165,6 @@ Define JumpServer StorageClass {{- if .Values.global.storageClass }} {{- .Values.global.storageClass }} {{- else -}} -{{- .Values.xrdp.persistence.storageClassName -}} +{{- .Values.razor.persistence.storageClassName -}} {{- end -}} {{- end -}} diff --git a/charts/jumpserver/templates/_images.tpl b/charts/jumpserver/templates/_images.tpl index c3046ec..500e6e6 100644 --- a/charts/jumpserver/templates/_images.tpl +++ b/charts/jumpserver/templates/_images.tpl @@ -58,10 +58,10 @@ Return the proper JumpServer magnus image name {{- end -}} {{/* -Return the proper JumpServer xrdp image name +Return the proper JumpServer razor image name */}} -{{- define "jumpserver.xrdpImage" -}} -{{- include "common.images.image" ( dict "imageRoot" .Values.xrdp.image "global" .Values.global ) -}} +{{- define "jumpserver.razorImage" -}} +{{- include "common.images.image" ( dict "imageRoot" .Values.razor.image "global" .Values.global ) -}} {{- end -}} {{/* diff --git a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml b/charts/jumpserver/templates/razor/deployment-xrdp.yaml similarity index 90% rename from charts/jumpserver/templates/xrdp/deployment-xrdp.yaml rename to charts/jumpserver/templates/razor/deployment-xrdp.yaml index 1b5c967..b748409 100644 --- a/charts/jumpserver/templates/xrdp/deployment-xrdp.yaml +++ b/charts/jumpserver/templates/razor/deployment-xrdp.yaml @@ -1,8 +1,8 @@ {{- if .Values.xpack.enabled }} -{{- with .Values.xrdp }} -{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-xrdp" }} -{{- $containerName := "jms-xrdp" }} -{{- $image := printf "%s" (include "jumpserver.xrdpImage" $) }} +{{- with .Values.razor }} +{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-razor" }} +{{- $containerName := "jms-razor" }} +{{- $image := printf "%s" (include "jumpserver.razorImage" $) }} apiVersion: apps/v1 kind: Deployment metadata: @@ -48,8 +48,6 @@ spec: value: {{ $.Values.core.config.bootstrapToken | quote }} - name: LOG_LEVEL value: {{ .config.log.level | quote }} - - name: JUMPSERVER_ENABLE_FONT_SMOOTHING - value: "true" {{- range $key, $val := .env }} - name: {{ $key }} value: {{ $val | quote }} @@ -65,8 +63,8 @@ spec: resources: {{- toYaml .resources | nindent 12 }} volumeMounts: - - mountPath: "/opt/xrdp/data" - name: "jms-xrdp-data" + - mountPath: "/opt/razor/data" + name: "jms-razor-data" {{- if .persistence.subPath }} subPath: {{ .persistence.subPath | quote }} {{- end }} @@ -79,9 +77,9 @@ spec: {{- if .persistence.existingClaim }} claimName: {{ .persistence.existingClaim | quote }} {{- else }} - claimName: '{{ include "jumpserver.fullname" $ }}-jms-xrdp-data' + claimName: '{{ include "jumpserver.fullname" $ }}-jms-razor-data' {{- end }} - name: "jms-xrdp-data" + name: "jms-razor-data" {{- with .volumes }} {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} diff --git a/charts/jumpserver/templates/xrdp/pvc-xrdp-data.yaml b/charts/jumpserver/templates/razor/pvc-razor-data.yaml similarity index 85% rename from charts/jumpserver/templates/xrdp/pvc-xrdp-data.yaml rename to charts/jumpserver/templates/razor/pvc-razor-data.yaml index 99c262e..f9fc92e 100644 --- a/charts/jumpserver/templates/xrdp/pvc-xrdp-data.yaml +++ b/charts/jumpserver/templates/razor/pvc-razor-data.yaml @@ -1,6 +1,6 @@ {{- if .Values.xpack.enabled }} -{{- with .Values.xrdp }} -{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-xrdp-data" }} +{{- with .Values.razor }} +{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-razor-data" }} apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -25,5 +25,5 @@ spec: requests: storage: {{ .persistence.size | quote }} {{- end }} - storageClassName: {{ include "jumpserver.xrdp.storageClass" . }} + storageClassName: {{ include "jumpserver.razor.storageClass" . }} {{- end }} diff --git a/charts/jumpserver/templates/xrdp/service-xrdp.yaml b/charts/jumpserver/templates/razor/service-razor.yaml similarity index 94% rename from charts/jumpserver/templates/xrdp/service-xrdp.yaml rename to charts/jumpserver/templates/razor/service-razor.yaml index 41867f5..24bd193 100644 --- a/charts/jumpserver/templates/xrdp/service-xrdp.yaml +++ b/charts/jumpserver/templates/razor/service-razor.yaml @@ -1,6 +1,6 @@ {{- if .Values.xpack.enabled }} -{{- with .Values.xrdp }} -{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-xrdp" }} +{{- with .Values.razor }} +{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-razor" }} apiVersion: v1 kind: Service metadata: diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml index fc92e4f..5980009 100644 --- a/charts/jumpserver/values.yaml +++ b/charts/jumpserver/values.yaml @@ -508,9 +508,9 @@ omnidb: affinity: {} -xrdp: +razor: labels: - app.jumpserver.org/name: jms-xrdp + app.jumpserver.org/name: jms-razor config: log: @@ -520,22 +520,13 @@ xrdp: image: registry: registry.fit2cloud.com - repository: jumpserver/xrdp + repository: jumpserver/razor tag: v2.23.0 pullPolicy: IfNotPresent command: [] - env: - # tcp_send_buffer_bytes and tcp_recv_buffer_bytes See: https://github.com/neutrinolabs/xrdp/issues/1483 - TCP_SEND_BUFFER_BYTES: 4194304 - TCP_RECV_BUFFER_BYTES: 6291456 - JUMPSERVER_ENABLE_FONT_SMOOTHING: true - # JUMPSERVER_ENABLE_WALLPAPER: true - # JUMPSERVER_ENABLE_THEMING: true - # JUMPSERVER_ENABLE_FULL_WINDOW_DRAG: true - # JUMPSERVER_ENABLE_DESKTOP_COMPOSITION: true - # JUMPSERVER_ENABLE_MENU_ANIMATIONS: true + env: [] livenessProbe: failureThreshold: 30