diff --git a/library/ix-dev/community/gitea/Chart.yaml b/library/ix-dev/community/gitea/Chart.yaml index f2c9fbd455..475ab6bd25 100644 --- a/library/ix-dev/community/gitea/Chart.yaml +++ b/library/ix-dev/community/gitea/Chart.yaml @@ -3,7 +3,7 @@ description: Gitea - Git with a cup of tea annotations: title: Gitea type: application -version: 1.1.20 +version: 1.1.21 apiVersion: v2 appVersion: 1.22.0 kubeVersion: '>=1.16.0-0' diff --git a/library/ix-dev/community/gitea/ci/basic-values.yaml b/library/ix-dev/community/gitea/ci/basic-values.yaml index 5a53f8db0c..68bcb88895 100644 --- a/library/ix-dev/community/gitea/ci/basic-values.yaml +++ b/library/ix-dev/community/gitea/ci/basic-values.yaml @@ -13,3 +13,4 @@ giteaStorage: giteaNetwork: rootURL: http://localhost:30000 + externalSshPort: 22 diff --git a/library/ix-dev/community/gitea/questions.yaml b/library/ix-dev/community/gitea/questions.yaml index da30045f3b..987d5ae074 100644 --- a/library/ix-dev/community/gitea/questions.yaml +++ b/library/ix-dev/community/gitea/questions.yaml @@ -21,7 +21,6 @@ portals: path: "$kubernetes-resource_configmap_portal_path" questions: - - variable: giteaConfig label: "" group: Gitea Configuration @@ -105,6 +104,17 @@ questions: min: 9000 max: 65535 required: true + - variable: externalSshPort + label: External SSH Port + description: | + The ssh port that Gitea will be available at externally.
+ Leave empty to use the same port as the ssh port. + schema: + type: int + "null": true + default: null + min: 9000 + max: 65535 - variable: hostNetwork label: Host Network description: | diff --git a/library/ix-dev/community/gitea/templates/_configuration.tpl b/library/ix-dev/community/gitea/templates/_configuration.tpl index 1a3265cf4a..bdaeb6b47f 100644 --- a/library/ix-dev/community/gitea/templates/_configuration.tpl +++ b/library/ix-dev/community/gitea/templates/_configuration.tpl @@ -45,7 +45,7 @@ configmap: data: {{ $protocol := "http" }} GITEA__server__HTTP_PORT: {{ .Values.giteaNetwork.webPort | quote }} - GITEA__server__SSH_PORT: {{ .Values.giteaNetwork.sshPort | quote }} + GITEA__server__SSH_PORT: {{ .Values.giteaNetwork.externalSshPort | default .Values.giteaNetwork.sshPort | quote }} GITEA__server__SSH_LISTEN_PORT: {{ .Values.giteaNetwork.sshPort | quote }} GITEA__server__ROOT_URL: {{ .Values.giteaNetwork.rootURL | quote }} {{ if .Values.giteaNetwork.certificateID }} diff --git a/library/ix-dev/community/tdarr/Chart.yaml b/library/ix-dev/community/tdarr/Chart.yaml index e02d38635c..551415bf63 100644 --- a/library/ix-dev/community/tdarr/Chart.yaml +++ b/library/ix-dev/community/tdarr/Chart.yaml @@ -3,7 +3,7 @@ description: Tdarr is a Distributed Transcoding System annotations: title: Tdarr type: application -version: 1.2.5 +version: 1.2.6 apiVersion: v2 appVersion: 2.17.01 kubeVersion: '>=1.16.0-0' diff --git a/library/ix-dev/community/tdarr/upgrade_strategy b/library/ix-dev/community/tdarr/upgrade_strategy index 0baeed4d24..798b8ab925 100755 --- a/library/ix-dev/community/tdarr/upgrade_strategy +++ b/library/ix-dev/community/tdarr/upgrade_strategy @@ -14,7 +14,11 @@ STRIP_TEXT = '_ffmpeg5' def newer_mapping(image_tags): key = list(image_tags.keys())[0] - tags = {RE_CLEAN_VERSION.sub("\\1", t.strip(STRIP_TEXT)): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} + tags = { + RE_CLEAN_VERSION.sub('\\1', t.strip(STRIP_TEXT)): t + for t in image_tags[key] + if RE_STABLE_VERSION.fullmatch(t) + } version = semantic_versioning(list(tags)) if not version: return {}