From a7f1f4c19fa94ec109c983e8adec73a9c54641f7 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Sun, 2 Jul 2023 13:19:34 -0400 Subject: [PATCH] migrate(sftpgo): Migrate to new common *Breaking* (#10091) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Update this to new common, was pretty much stable beforehand also ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/incubator/sftpgo/Chart.yaml | 14 +-- charts/incubator/sftpgo/questions.yaml | 92 ++++++++++--------- charts/incubator/sftpgo/templates/NOTES.txt | 1 + charts/incubator/sftpgo/templates/common.yaml | 3 +- charts/incubator/sftpgo/values.yaml | 62 +++++++------ 5 files changed, 92 insertions(+), 80 deletions(-) create mode 100644 charts/incubator/sftpgo/templates/NOTES.txt diff --git a/charts/incubator/sftpgo/Chart.yaml b/charts/incubator/sftpgo/Chart.yaml index 2a6b66f1b16..e9875e4e4b9 100644 --- a/charts/incubator/sftpgo/Chart.yaml +++ b/charts/incubator/sftpgo/Chart.yaml @@ -1,13 +1,9 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - Network-FTP apiVersion: v2 -appVersion: "latest" +appVersion: "v2.5.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.14.6 deprecated: false description: "Fully featured and highly configurable SFTP server with optional HTTP/S, FTP, FTPS and WebDAV support. Several storage backends are supported: local filesystem, encrypted local filesystem, S3 (compatible) Object Storage, Google Cloud Storage, Azure Blob Storage, SFTP." home: https://truecharts.org/charts/incubator/sftpgo @@ -25,4 +21,8 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/sftpgo - https://github.com/drakkan/sftpgo type: application -version: 2.0.13 +version: 3.0.0 +annotations: + truecharts.org/SCALE-support: "true" + truecharts.org/catagories: | + - Network-FTP diff --git a/charts/incubator/sftpgo/questions.yaml b/charts/incubator/sftpgo/questions.yaml index 646e605c765..c036bf52a4a 100644 --- a/charts/incubator/sftpgo/questions.yaml +++ b/charts/incubator/sftpgo/questions.yaml @@ -13,51 +13,53 @@ questions: # Include{containerBasic} # Include{containerAdvanced} - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP - label: "SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP" - description: "Put your server IP here for local access, or your public IP for public access via port forwarding." - schema: - type: string - default: "10.0.0.10" - - variable: SFTPGO_COMMON__DEFENDER__ENABLED - label: "SFTPGO_COMMON__DEFENDER__ENABLED" - description: "httpsgithub.comdrakkansftpgoblobmaindocsdefender.md" - schema: - type: string - default: "true" - - variable: SFTPGO_FTPD__PASSIVE_PORT_RANGE__START - label: "SFTPGO_FTPD__PASSIVE_PORT_RANGE__START" - schema: - type: string - default: "50000" - - variable: SFTPGO_FTPD__PASSIVE_PORT_RANGE__END - label: "SFTPGO_FTPD__PASSIVE_PORT_RANGE__END" - schema: - type: string - default: "50100" - - variable: SFTPGO_FTPD__BINDINGS__0__PORT - label: "SFTPGO_FTPD__BINDINGS__0__PORT" - schema: - type: string - default: "2121" - - variable: SFTPGO_WEBDAVD__BINDINGS__0__PORT - label: "SFTPGO_WEBDAVD__BINDINGS__0__PORT" - schema: - type: string - default: "10080" - - variable: SFTPGO_FTPD__BINDINGS__0__DEBUG - label: "SFTPGO_FTPD__BINDINGS__0__DEBUG" - description: "0 = false, 1 = true" - schema: - type: string - default: "0" +# Include{containerMain} + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP + label: "SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP" + description: "Put your server IP here for local access, or your public IP for public access via port forwarding." + schema: + type: string + default: "10.0.0.10" + - variable: SFTPGO_COMMON__DEFENDER__ENABLED + label: "SFTPGO_COMMON__DEFENDER__ENABLED" + description: "httpsgithub.comdrakkansftpgoblobmaindocsdefender.md" + schema: + type: string + default: "true" + - variable: SFTPGO_FTPD__PASSIVE_PORT_RANGE__START + label: "SFTPGO_FTPD__PASSIVE_PORT_RANGE__START" + schema: + type: string + default: "50000" + - variable: SFTPGO_FTPD__PASSIVE_PORT_RANGE__END + label: "SFTPGO_FTPD__PASSIVE_PORT_RANGE__END" + schema: + type: string + default: "50100" + - variable: SFTPGO_FTPD__BINDINGS__0__PORT + label: "SFTPGO_FTPD__BINDINGS__0__PORT" + schema: + type: string + default: "2121" + - variable: SFTPGO_WEBDAVD__BINDINGS__0__PORT + label: "SFTPGO_WEBDAVD__BINDINGS__0__PORT" + schema: + type: string + default: "10080" + - variable: SFTPGO_FTPD__BINDINGS__0__DEBUG + label: "SFTPGO_FTPD__BINDINGS__0__DEBUG" + description: "0 = false, 1 = true" + schema: + type: string + default: "0" # Include{containerConfig} # Include{serviceRoot} - variable: main diff --git a/charts/incubator/sftpgo/templates/NOTES.txt b/charts/incubator/sftpgo/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/sftpgo/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/sftpgo/templates/common.yaml b/charts/incubator/sftpgo/templates/common.yaml index cbf66c20818..b51394e00a4 100644 --- a/charts/incubator/sftpgo/templates/common.yaml +++ b/charts/incubator/sftpgo/templates/common.yaml @@ -1,2 +1 @@ -{{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/sftpgo/values.yaml b/charts/incubator/sftpgo/values.yaml index a620f3fb78c..9057b473952 100644 --- a/charts/incubator/sftpgo/values.yaml +++ b/charts/incubator/sftpgo/values.yaml @@ -1,15 +1,22 @@ -env: - SFTPGO_COMMON__DEFENDER__ENABLED: "true" - SFTPGO_FTPD__BINDINGS__0__DEBUG: "0" - SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP: 10.0.0.10 - SFTPGO_FTPD__BINDINGS__0__PORT: "2121" - SFTPGO_FTPD__PASSIVE_PORT_RANGE__END: "50100" - SFTPGO_FTPD__PASSIVE_PORT_RANGE__START: "50000" - SFTPGO_WEBDAVD__BINDINGS__0__PORT: "10080" image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/sftpgo - tag: latest@sha256:48b22b6bfe9beb43c747436c4376c43b739ee639d795c68ccfca59960c9c45c7 + tag: v2.5.3@sha256:1a159663e5a9a2430edbf9b143fe8cab2998697bee9909598db32351c9de4f85 + +workload: + main: + podSpec: + containers: + main: + env: + SFTPGO_COMMON__DEFENDER__ENABLED: "true" + SFTPGO_FTPD__BINDINGS__0__DEBUG: "0" + SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP: 10.0.0.10 + SFTPGO_FTPD__BINDINGS__0__PORT: "2121" + SFTPGO_FTPD__PASSIVE_PORT_RANGE__END: "50100" + SFTPGO_FTPD__PASSIVE_PORT_RANGE__START: "50000" + SFTPGO_WEBDAVD__BINDINGS__0__PORT: "10080" + persistence: backupdirectory: enabled: true @@ -22,35 +29,37 @@ persistence: mountPath: /srv/sftpgo/data shareaccess: enabled: true - mountPath: /unraid -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 + mountPath: /shareaccess + securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + runAsNonRoot: false + readOnlyRootFilesystem: false + runAsUser: 0 + runAsGroup: 0 + service: + main: + ports: + main: + port: 2221 + protocol: http + targetPort: 8080 ftpport: enabled: true ports: ftpport: enabled: true port: 2121 - protocol: TCP + protocol: http targetPort: 2121 - main: - ports: - main: - port: 2221 - protocol: HTTP - targetPort: 8080 passiveports: enabled: true ports: passiveports: enabled: true port: 50000 - protocol: TCP + protocol: http targetPort: 50000 sftpport: enabled: true @@ -58,7 +67,7 @@ service: sftpport: enabled: true port: 2022 - protocol: TCP + protocol: tcp targetPort: 2022 webdavport: enabled: true @@ -66,8 +75,9 @@ service: webdavport: enabled: true port: 10080 - protocol: TCP + protocol: tcp targetPort: 10080 portal: - enabled: true + open: + enabled: true