From e7db8cddd9d31724d8e9531039a3a13f672dcdf0 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 16 Jun 2025 14:21:00 +0000 Subject: [PATCH] refactor: clarify SSH behavior for rootful images (#876) For rootful Gitea images, the built-in OpenSSH server is reused, and Gitea itself does not listen on any SSH port. Therefore, the `SSH_LISTEN_PORT` setting has no effect. Explicitly setting `START_SSH_SERVER` helps avoid confusion and makes the behavior clearer. Reviewed-on: https://gitea.com/gitea/helm-gitea/pulls/876 Reviewed-by: pat-s Co-authored-by: Lunny Xiao Co-committed-by: Lunny Xiao --- templates/_helpers.tpl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index ee9c92b..f993b95 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -361,16 +361,18 @@ https {{- if not .Values.gitea.config.server.SSH_PORT -}} {{- $_ := set .Values.gitea.config.server "SSH_PORT" .Values.service.ssh.port -}} {{- end -}} - {{- if not (hasKey .Values.gitea.config.server "SSH_LISTEN_PORT") -}} - {{- if not .Values.image.rootless -}} - {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" .Values.gitea.config.server.SSH_PORT -}} - {{- else -}} - {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" "2222" -}} - {{- end -}} - {{- end -}} {{- if not (hasKey .Values.gitea.config.server "START_SSH_SERVER") -}} {{- if .Values.image.rootless -}} {{- $_ := set .Values.gitea.config.server "START_SSH_SERVER" "true" -}} + {{- if not (hasKey .Values.gitea.config.server "SSH_LISTEN_PORT") -}} + {{- if not .Values.gitea.config.server.SSH_LISTEN_PORT -}} + {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" .Values.gitea.config.server.SSH_PORT -}} + {{- else -}} + {{- $_ := set .Values.gitea.config.server "SSH_LISTEN_PORT" .Values.gitea.config.server.SSH_LISTEN_PORT -}} + {{- end -}} + {{- end -}} + {{- else -}} + {{- $_ := set .Values.gitea.config.server "START_SSH_SERVER" "false" -}} {{- end -}} {{- end -}} {{- if not (hasKey .Values.gitea.config.server "APP_DATA_PATH") -}}